diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
| commit | 485bb64ddbcc372c5ed3d74190eda06f02cb3f82 (patch) | |
| tree | e89ec33366b907bea794e9140f962d2951b29ff9 /synapse/api/events/__init__.py | |
| parent | Use new StreamToken in pagination config (diff) | |
| parent | Add the ability to turn on the twisted manhole telnet service. (diff) | |
| download | synapse-485bb64ddbcc372c5ed3d74190eda06f02cb3f82.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/api/events/__init__.py')
| -rw-r--r-- | synapse/api/events/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py index 921fd08832..f9653e0b2a 100644 --- a/synapse/api/events/__init__.py +++ b/synapse/api/events/__init__.py @@ -41,16 +41,17 @@ class SynapseEvent(JsonEncodedObject): "room_id", "user_id", # sender/initiator "content", # HTTP body, JSON + "state_key", ] internal_keys = [ "is_state", - "state_key", "prev_events", "prev_state", "depth", "destinations", "origin", + "outlier", ] required_keys = [ |