diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 14:13:06 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 14:13:06 +0100 |
| commit | 47519cd8c27c343405431c206660ba74fdea52f6 (patch) | |
| tree | 77b7a55778c42e256b99577226a6172f719e8416 /synapse/storage | |
| parent | Implement presence event source. Change the way the notifier indexes listeners (diff) | |
| parent | fix joining rooms on webclient (diff) | |
| download | synapse-47519cd8c27c343405431c206660ba74fdea52f6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index a97a42e1e3..38ab03c45c 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -80,7 +80,6 @@ class DataStore(RoomMemberStore, RoomStore, [ "event_id", "type", - "sender", "room_id", "content", "unrecognized_keys" |