summary refs log tree commit diff
path: root/webclient/app-controller.js
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-31 17:48:05 +0000
committerErik Johnston <erik@matrix.org>2014-10-31 17:48:05 +0000
commitb63691f6e205b4e2d2a990ff04318e4daf731e2c (patch)
treeaa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /webclient/app-controller.js
parentCoturn's timestamps are in seconds, not milliseconds (diff)
parentBump version numbers and change log (diff)
downloadsynapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
Diffstat (limited to 'webclient/app-controller.js')
-rw-r--r--webclient/app-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js
index 7d61207554..e4b7cd286f 100644
--- a/webclient/app-controller.js
+++ b/webclient/app-controller.js
@@ -53,7 +53,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even
      * Open a given page.
      * @param {String} url url of the page
      */
-    $scope.goToPage = function(url) {
+    $rootScope.goToPage = function(url) {
         $location.url(url);
     };