summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-10 14:49:52 +0000
committerErik Johnston <erik@matrix.org>2014-12-10 14:49:52 +0000
commitcabead6194c2946c2d05d6662c7ffe237d60291d (patch)
treed5cb38ed367389980a548645e360d862ad36ba7d /synapse/events
parentFix bug when uploading state with empty state_key (diff)
downloadsynapse-cabead6194c2946c2d05d6662c7ffe237d60291d.tar.xz
Actually fix bug when uploading state with empty state_key
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py
index bd3ffb59cc..7103b937af 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -94,6 +94,7 @@ class EventBase(object):
     event_id = _event_dict_property("event_id")
     hashes = _event_dict_property("hashes")
     origin = _event_dict_property("origin")
+    origin_server_ts = _event_dict_property("origin_server_ts")
     prev_events = _event_dict_property("prev_events")
     prev_state = _event_dict_property("prev_state")
     room_id = _event_dict_property("room_id")