diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-17 10:29:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-17 10:29:23 +0000 |
| commit | 8c45c8b8b98c5a0e98bf4051994fed9847aadd08 (patch) | |
| tree | 12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /synapse/api/events/utils.py | |
| parent | Move getLastMessage to modelService. (diff) | |
| parent | Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects (diff) | |
| download | synapse-8c45c8b8b98c5a0e98bf4051994fed9847aadd08.tar.xz | |
Merge pull request #14 from matrix-org/merge_pdu_event_objects
Merge pdu and event objects
Diffstat (limited to 'synapse/api/events/utils.py')
| -rw-r--r-- | synapse/api/events/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/events/utils.py b/synapse/api/events/utils.py index 802648f8f7..d6019d56eb 100644 --- a/synapse/api/events/utils.py +++ b/synapse/api/events/utils.py @@ -42,6 +42,8 @@ def prune_event(event): "prev_events", "prev_state", "auth_events", + "origin", + "origin_server_ts", ] new_content = {} |