summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 20:28:11 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 20:28:11 +0100
commita85612baf834e805d9174cd2e0c45c3d2b4b74f5 (patch)
treeb9c869901d2252c42cc7a571411046f16078f2f0 /synapse/federation
parentUpdate readme with instructions on how to generate configs for homeservers (diff)
parentDon't put required power levels on permission state events (diff)
downloadsynapse-a85612baf834e805d9174cd2e0c45c3d2b4b74f5.tar.xz
Merge branch 'room_config' into develop
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/units.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 2b2f11f36a..b468f70546 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -68,6 +68,7 @@ class Pdu(JsonEncodedObject):
         "power_level",
         "prev_state_id",
         "prev_state_origin",
+        "required_power_level",
     ]
 
     internal_keys = [