mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-08 00:42:14 -04:00
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_invite_server
This commit is contained in:
commit
35e1d67b4e
24 changed files with 261 additions and 118 deletions
|
@ -68,6 +68,7 @@ class EventTypes(object):
|
|||
Aliases = "m.room.aliases"
|
||||
Redaction = "m.room.redaction"
|
||||
ThirdPartyInvite = "m.room.third_party_invite"
|
||||
Encryption = "m.room.encryption"
|
||||
|
||||
RoomHistoryVisibility = "m.room.history_visibility"
|
||||
CanonicalAlias = "m.room.canonical_alias"
|
||||
|
@ -128,4 +129,4 @@ class UserTypes(object):
|
|||
'admin' and 'guest' users should also be UserTypes. Normal users are type None
|
||||
"""
|
||||
SUPPORT = "support"
|
||||
ALL_USER_TYPES = (SUPPORT)
|
||||
ALL_USER_TYPES = (SUPPORT,)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue