diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
| commit | e3aec9bc818e203a4883f8863acb96b9c273112a (patch) | |
| tree | 762f87365f917f510f00bc6aee7a4068cdd56e76 /synapse/federation | |
| parent | fix embarassing bug where in-progress messages get vaped when the previous on... (diff) | |
| parent | Bump version and change log (diff) | |
| download | synapse-e3aec9bc818e203a4883f8863acb96b9c273112a.tar.xz | |
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts: webclient/room/room-controller.js
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/units.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py index 9740431279..622fe66a8f 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py @@ -69,6 +69,7 @@ class Pdu(JsonEncodedObject): "prev_state_id", "prev_state_origin", "required_power_level", + "user_id", ] internal_keys = [ |