Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:24:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-v0.6.0' into develop

Browse source
This commit is contained in:
Mark Haines 2014-12-16 17:29:49 +00:00
commit 56db465047
10 changed files with 194 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/state.py
View file

@ -203,9 +203,10 @@ class StateHandler(object):
}
if event_type:
prev_states = conflicted_state.get(
(event_type, state_key), {}
).keys()
prev_states_events = conflicted_state.get(
(event_type, state_key), []
)
prev_states = [s.event_id for s in prev_states_events]
else:
prev_states = []