summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-08-29 11:18:57 +0100
committerErik Johnston <erik@matrix.org>2019-08-29 11:18:57 +0100
commita81e0233e917178750c45c067476332407f5658c (patch)
treee5d2f134baa7f420fde71afc484d2c62b71df33c /synapse/api/constants.py
parentMerge branch 'release-v1.3.1' into matrix-org-hotfixes (diff)
parentAdd a link to python's logging config schema (#5926) (diff)
downloadsynapse-a81e0233e917178750c45c067476332407f5658c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/constants.py')
-rw-r--r--synapse/api/constants.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 3ffde0d7fc..f29bce560c 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -122,7 +122,8 @@ class UserTypes(object): """ SUPPORT = "support" - ALL_USER_TYPES = (SUPPORT,) + BOT = "bot" + ALL_USER_TYPES = (SUPPORT, BOT) class RelationTypes(object):