diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
| commit | e66d0bd03abc75b5a0445acadc776ba23e1090ba (patch) | |
| tree | d73f7c0c2621a27c1637223213a930e40140728d /synapse/events | |
| parent | Update CHANGES (diff) | |
| parent | Merge pull request #569 from matrix-org/erikj/initial_sync (diff) | |
| download | synapse-e66d0bd03abc75b5a0445acadc776ba23e1090ba.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/snapshot.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index f51200d18e..8a475417a6 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -20,3 +20,4 @@ class EventContext(object): self.current_state = current_state self.state_group = None self.rejected = False + self.push_actions = [] |