diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:14:17 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:14:17 +0000 |
| commit | 61fc37e467bafe8b1178ec35daf0655049b3cc73 (patch) | |
| tree | fd47305db5a3d6d8f08514d0c1620628b35495a2 /synapse/api/events/__init__.py | |
| parent | import Image as PIL.Image. (diff) | |
| parent | point the entry_point for synapse-homeserver at the right method (diff) | |
| download | synapse-61fc37e467bafe8b1178ec35daf0655049b3cc73.tar.xz | |
Merge branch 'develop' into media_repository
Diffstat (limited to 'synapse/api/events/__init__.py')
| -rw-r--r-- | synapse/api/events/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py index 8a35b4cb7d..22939d011a 100644 --- a/synapse/api/events/__init__.py +++ b/synapse/api/events/__init__.py @@ -125,6 +125,7 @@ class SynapseEvent(JsonEncodedObject): pdu_json.pop("outlier", None) pdu_json.pop("replaces_state", None) pdu_json.pop("redacted", None) + pdu_json.pop("prev_content", None) state_hash = pdu_json.pop("state_hash", None) if state_hash is not None: pdu_json.setdefault("unsigned", {})["state_hash"] = state_hash |