Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename

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",