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

Merge branch 'develop' of github.com:matrix-org/synapse into state-chache

Browse source 
Conflicts:
	synapse/app/homeserver.py
	synapse/state.py
This commit is contained in:
Erik Johnston 2015-02-10 11:04:37 +00:00
commit c86ebe7673
18 changed files with 291 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/state.py
View file

@ -114,7 +114,7 @@ class StateHandler(object):
defer.returnValue(state.get((event_type, state_key)))
return
defer.returnValue(state.values())
defer.returnValue(state)
@defer.inlineCallbacks
def compute_event_context(self, event, old_state=None):