diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-24 14:39:35 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-24 14:39:35 +0100 |
| commit | 37638c06c59bbf7327d5c1edc4b9e346716e7374 (patch) | |
| tree | 1c843a49d3d5168ff998a54f50d30cdc3814f104 /synapse/events/utils.py | |
| parent | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-37638c06c59bbf7327d5c1edc4b9e346716e7374.tar.xz | |
Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse v0.17.1
Diffstat (limited to 'synapse/events/utils.py')
| -rw-r--r-- | synapse/events/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index aab18d7f71..0e9fd902af 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -88,6 +88,8 @@ def prune_event(event): if "age_ts" in event.unsigned: allowed_fields["unsigned"]["age_ts"] = event.unsigned["age_ts"] + if "replaces_state" in event.unsigned: + allowed_fields["unsigned"]["replaces_state"] = event.unsigned["replaces_state"] return type(event)( allowed_fields, |