summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-03-11 21:12:30 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2019-03-11 21:12:30 +1100
commit30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14 (patch)
tree3ed918908fb7e7572c6f2c6d7244262b365e4444 /synapse/events
parentinitial (diff)
parentMerge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff)
downloadsynapse-30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py
index bd130f8816..fafa135182 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -141,7 +141,6 @@ class EventBase(object):
     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")
     redacts = _event_dict_property("redacts")
     room_id = _event_dict_property("room_id")
     sender = _event_dict_property("sender")