Merge branch 'develop' into travis/login-terms

This commit is contained in:
Travis Ralston 2018-10-31 13:15:14 -06:00
commit d1e7b9c44c
91 changed files with 2562 additions and 1263 deletions

View file

@ -62,6 +62,7 @@ class LoginType(object):
class EventTypes(object):
Member = "m.room.member"
Create = "m.room.create"
Tombstone = "m.room.tombstone"
JoinRules = "m.room.join_rules"
PowerLevels = "m.room.power_levels"
Aliases = "m.room.aliases"