diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 17:20:06 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 17:20:06 +0100 |
| commit | 1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29 (patch) | |
| tree | 74528065c199aa426611c41a1351f54e35fa3f3a /synapse/federation/units.py | |
| parent | Initial hack at some RoomMemberStore unit tests (diff) | |
| parent | Make the state resolution use actual power levels rather than taking them fro... (diff) | |
| download | synapse-1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29.tar.xz | |
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Conflicts: synapse/storage/pdu.py
Diffstat (limited to 'synapse/federation/units.py')
| -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 = [ |