summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-13 03:01:51 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-13 03:01:51 +0100
commit8c32e3387f2e1a71c6a7e0597063a30becb11ec2 (patch)
treebdc9320b235e171d2baa0b32ced383f88802d0a9 /synapse/rest
parentremove remaining TODOs and fill in lots more info (diff)
parentactually register the login servlet (uncommitted code thinko?) (diff)
downloadsynapse-8c32e3387f2e1a71c6a7e0597063a30becb11ec2.tar.xz
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 5598295793..3d4dd098d6 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from . import (
-    room, events, register, profile, public, presence, im, directory
+    room, events, register, login, profile, public, presence, im, directory
 )
 
 class RestServletFactory(object):
@@ -35,10 +35,9 @@ class RestServletFactory(object):
         room.register_servlets(hs, http_server)
         events.register_servlets(hs, http_server)
         register.register_servlets(hs, http_server)
+        login.register_servlets(hs, http_server)
         profile.register_servlets(hs, http_server)
         public.register_servlets(hs, http_server)
         presence.register_servlets(hs, http_server)
         im.register_servlets(hs, http_server)
         directory.register_servlets(hs, http_server)
-
-