diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
commit | bf05218c4b1740cdc5477cadbc36f0575e2dcd51 (patch) | |
tree | ced8ed09e18afb11e97734959150b8ef7f0db833 /synapse/storage/__init__.py | |
parent | Fold federation/handler into handlers/federation (diff) | |
parent | Added support for GET /events/$eventid with auth checks. (diff) | |
download | synapse-bf05218c4b1740cdc5477cadbc36f0575e2dcd51.tar.xz |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/storage/__init__.py')
-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 130387184f..08505f05ff 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -88,7 +88,6 @@ class DataStore(RoomMemberStore, RoomStore, [ "event_id", "type", - "sender", "room_id", "content", "unrecognized_keys" |