diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-14 11:35:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-14 11:35:05 +0000 |
| commit | bb256ac96f2a10b60708d5273bee5df2533f10b8 (patch) | |
| tree | ae6d19a234b566ff4fc58ec1d7b47c9622843b2c /synapse/api/constants.py | |
| parent | Add new storage function to slave store (diff) | |
| parent | Merge pull request #1996 from matrix-org/erikj/fix_current_state (diff) | |
| download | synapse-bb256ac96f2a10b60708d5273bee5df2533f10b8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed
Diffstat (limited to 'synapse/api/constants.py')
| -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" |