summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
commitebbd37b66db2c5ed700d50dd00e3e108d7f1268c (patch)
tree235bd75367c221a98d10c03eb86d63173e875bb2 /synapse/api
parentMerge branch 'release-v1.44' into matrix-org-hotfixes (diff)
parentFix error in `get_user_ip_and_agents` when fetching from the database (#10968) (diff)
downloadsynapse-ebbd37b66db2c5ed700d50dd00e3e108d7f1268c.tar.xz
Merge branch 'release-v1.44' into matrix-org-hotfixes
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 39fd9954d5..a31f037748 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -217,6 +217,9 @@ class EventContentFields: # For "marker" events MSC2716_MARKER_INSERTION = "org.matrix.msc2716.marker.insertion" + # The authorising user for joining a restricted room. + AUTHORISING_USER = "join_authorised_via_users_server" + class RoomTypes: """Understood values of the room_type field of m.room.create events."""