diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:04:26 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:04:26 +0100 |
| commit | 52b64617f9b5e29a0e0aa4d524525e99501880c9 (patch) | |
| tree | 01f40f3cddf1dc608f33efe7b34c95b88ac2bb62 /synapse/api/events/__init__.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff) | |
| parent | Add 'state_key' to valid_keys (diff) | |
| download | synapse-52b64617f9b5e29a0e0aa4d524525e99501880c9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'synapse/api/events/__init__.py')
| -rw-r--r-- | synapse/api/events/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py index aa04dbece7..f9653e0b2a 100644 --- a/synapse/api/events/__init__.py +++ b/synapse/api/events/__init__.py @@ -41,11 +41,11 @@ 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", |