diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:30:17 -0500 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:30:17 -0500 |
commit | 287c81abf3c5b4bc01b4bf9c415b8ed939413c41 (patch) | |
tree | 013f1ce57cdaae78ae6d0ddf0ef7593ff63de5fa /synapse/api/constants.py | |
parent | Preserve version string in user agent (diff) | |
parent | Explicitly add Create event as auth event (diff) | |
download | synapse-287c81abf3c5b4bc01b4bf9c415b8ed939413c41.tar.xz |
Merge branch 'develop' into daniel/useragent
Diffstat (limited to 'synapse/api/constants.py')
-rw-r--r-- | synapse/api/constants.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 3385664394..008ee64727 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -83,3 +83,4 @@ class RejectedReason(object): class RoomCreationPreset(object): PRIVATE_CHAT = "private_chat" PUBLIC_CHAT = "public_chat" + TRUSTED_PRIVATE_CHAT = "trusted_private_chat" |