diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-03-13 12:20:47 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-03-13 12:20:47 +0000 |
| commit | 3c69f324024db9868bdec42a9aceb666c48d209f (patch) | |
| tree | 1e09876712257aebb5fb63c41c7e9c97908ba11e /synapse/api | |
| parent | Move FederationServer._handle_new_pdu to FederationHandler (diff) | |
| parent | Merge pull request #1983 from matrix-org/rav/no_redirect_stdio (diff) | |
| download | synapse-3c69f324024db9868bdec42a9aceb666c48d209f.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 489efb7f86..ca23c9c460 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd -# Copyright 2017 Vector Creations Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -45,7 +44,6 @@ class JoinRules(object): class LoginType(object): PASSWORD = u"m.login.password" EMAIL_IDENTITY = u"m.login.email.identity" - MSISDN = u"m.login.msisdn" RECAPTCHA = u"m.login.recaptcha" DUMMY = u"m.login.dummy" |