summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-19 16:41:13 +0100
committerErik Johnston <erik@matrix.org>2014-08-19 16:41:13 +0100
commite2b861cc67dc7be2b9f4fc8153cb37da362eee9c (patch)
treeff158048eecc19f0c76494b393e8e74102bb548f /webclient/components
parentRemove debug logging from token parsing funcs. (diff)
parentAdded registration/login jsfiddle, formatted so it can be loaded directly fro... (diff)
downloadsynapse-e2b861cc67dc7be2b9f4fc8153cb37da362eee9c.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/matrix/matrix-service.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 828396c866..664c5967af 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -68,9 +68,7 @@ angular.module('matrixService', [])
             params: params,
             data: data,
             headers: headers
-        })
-
-        return deferred.promise;
+        });
     };