Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix-org-hotfixes

1 files changed, 2 insertions, 0 deletions

diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 5baba43966..4df930c8d1 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -76,6 +76,8 @@ class EventTypes(object):
     Topic = "m.room.topic"
     Name = "m.room.name"
 
+    ServerACL = "m.room.server_acl"
+
 
 class RejectedReason(object):
     AUTH_ERROR = "auth_error"