diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:25 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:25 +0100 |
| commit | 284e1cb027c2c5e8376a5b83d21d626e18dcbc33 (patch) | |
| tree | 39adfb627d806891d95ffabb0bd7490f1fc737eb /synapse/state/__init__.py | |
| parent | Fix a bug with saml attribute maps. (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-284e1cb027c2c5e8376a5b83d21d626e18dcbc33.tar.xz | |
Merge branch 'develop' into rav/fix_attribute_mapping
Diffstat (limited to 'synapse/state/__init__.py')
| -rw-r--r-- | synapse/state/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index a0d34f16ea..2b0f4c79ee 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -136,7 +136,6 @@ class StateHandler(object): if event_id: event = yield self.store.get_event(event_id, allow_none=True) return event - return state_map = yield self.store.get_events( list(state.values()), get_prev_content=False |