diff options
author | Matthew Hodgson <matthew@matrix.org> | 2014-08-16 01:48:44 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2014-08-16 01:48:44 +0100 |
commit | 00e8be516a12bbb2fe9fe8cdad9a51286b2c5112 (patch) | |
tree | ee876ff3b36cfa32a68a065c150d7d573c702f6a | |
parent | emergency bodges to turn off presence ACLs in order to make (diff) | |
download | synapse-00e8be516a12bbb2fe9fe8cdad9a51286b2c5112.tar.xz |
merge weirdness
-rw-r--r-- | webclient/login/login-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js index aa928ef48d..67d0b7b90c 100644 --- a/webclient/login/login-controller.js +++ b/webclient/login/login-controller.js @@ -16,7 +16,7 @@ angular.module('LoginController', ['matrixService']) desired_user_name: "", user_id: "", password: "", - identityServer: "http://localhost:8090", + identityServer: "", pwd1: "", pwd2: "" }; |