diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
| commit | 4bbef62124f0fb249e314e94a1b9c15204c8daa9 (patch) | |
| tree | cc2e7458da160915f7224c0487f185e2433eaadb /synapse/events/snapshot.py | |
| parent | More 0_0 in tests (diff) | |
| parent | Merge pull request #1048 from matrix-org/erikj/fix_mail_name (diff) | |
| download | synapse-4bbef62124f0fb249e314e94a1b9c15204c8daa9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/events/snapshot.py')
| -rw-r--r-- | synapse/events/snapshot.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 8a475417a6..c75afd02d8 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -15,9 +15,8 @@ class EventContext(object): - - def __init__(self, current_state=None): - self.current_state = current_state + def __init__(self, current_state_ids=None): + self.current_state_ids = current_state_ids self.state_group = None self.rejected = False self.push_actions = [] |