diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
commit | c02da58a9da5c617c80fbeb7205f163e7b410c6f (patch) | |
tree | 8b166570eb2cbbecb7640d92d072f31add922535 /synapse/api/constants.py | |
parent | Consume errors in time_bound_deferred (diff) | |
parent | Merge pull request #74 from matrix-org/federation_min_depth_fix (diff) | |
download | synapse-c02da58a9da5c617c80fbeb7205f163e7b410c6f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
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 0d3fc629af..420f963d91 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -59,6 +59,7 @@ class LoginType(object): EMAIL_URL = u"m.login.email.url" EMAIL_IDENTITY = u"m.login.email.identity" RECAPTCHA = u"m.login.recaptcha" + APPLICATION_SERVICE = u"m.login.application_service" class EventTypes(object): |