summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 10:04:26 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 10:04:26 +0100
commit52b64617f9b5e29a0e0aa4d524525e99501880c9 (patch)
tree01f40f3cddf1dc608f33efe7b34c95b88ac2bb62
parentMerge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff)
parentAdd 'state_key' to valid_keys (diff)
downloadsynapse-52b64617f9b5e29a0e0aa4d524525e99501880c9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
-rw-r--r--synapse/api/events/__init__.py2
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",