diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
commit | 9978c5c10310512493b976f482f400bf30a78729 (patch) | |
tree | 5afafbfa518af855eb654a4a060f692b0ae2332e /synapse/state.py | |
parent | Merge branch 'develop' into application-services (diff) | |
parent | Merge pull request #60 from matrix-org/single_source_version_and_dependencies (diff) | |
download | synapse-9978c5c10310512493b976f482f400bf30a78729.tar.xz |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/state.py')
-rw-r--r-- | synapse/state.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py index 695a5e7ac4..54380b9e5c 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -76,7 +76,7 @@ class StateHandler(object): defer.returnValue(res[1].get((event_type, state_key))) return - defer.returnValue(res[1].values()) + defer.returnValue(res[1]) @defer.inlineCallbacks def compute_event_context(self, event, old_state=None): |