summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-04 13:39:51 +0000
committerDavid Baker <dave@matrix.org>2016-01-04 13:39:51 +0000
commit928c575c6f0920810751957dcf0a7bfdd5d855f2 (patch)
tree05addd9237604902e9450f5e3583fd9cbe268276 /synapse/rest
parentAddress minor PR issues (diff)
parentUpdate CHANGES (diff)
downloadsynapse-928c575c6f0920810751957dcf0a7bfdd5d855f2.tar.xz
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/login.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 776e1667c1..e8c35508cd 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -35,7 +35,7 @@ logger = logging.getLogger(__name__)
 
 
 class LoginRestServlet(ClientV1RestServlet):
-    PATTERNS = client_path_patterns("/login$", releases=(), include_in_unstable=False)
+    PATTERNS = client_path_patterns("/login$")
     PASS_TYPE = "m.login.password"
     SAML2_TYPE = "m.login.saml2"
     CAS_TYPE = "m.login.cas"