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

This commit is contained in:
Kegan Dougal 2014-08-26 10:04:26 +01:00
commit 52b64617f9

View File

@ -41,11 +41,11 @@ class SynapseEvent(JsonEncodedObject):
"room_id", "room_id",
"user_id", # sender/initiator "user_id", # sender/initiator
"content", # HTTP body, JSON "content", # HTTP body, JSON
"state_key",
] ]
internal_keys = [ internal_keys = [
"is_state", "is_state",
"state_key",
"prev_events", "prev_events",
"prev_state", "prev_state",
"depth", "depth",