diff options
author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/api | |
parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
parent | Revert "Support registration & login with phone number" (diff) | |
download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/constants.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index a8123cddcb..ca23c9c460 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -43,9 +43,6 @@ class JoinRules(object): class LoginType(object): PASSWORD = u"m.login.password" - OAUTH = u"m.login.oauth2" - EMAIL_CODE = u"m.login.email.code" - EMAIL_URL = u"m.login.email.url" EMAIL_IDENTITY = u"m.login.email.identity" RECAPTCHA = u"m.login.recaptcha" DUMMY = u"m.login.dummy" |