summary refs log tree commit diff
path: root/webclient/app.js
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 15:34:01 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 15:34:01 +0100
commit08881d808d7cfd600d130eb7a960c6c51c797a09 (patch)
tree1a8c8833a981b9a01e5f8c68c555203f2bc59455 /webclient/app.js
parentIndex sources in a nicer fashion. (diff)
parentBF: use room_id if there is no alias (diff)
downloadsynapse-08881d808d7cfd600d130eb7a960c6c51c797a09.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'webclient/app.js')
-rw-r--r--webclient/app.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/webclient/app.js b/webclient/app.js
index 6cd50c5e54..1d5503ebc0 100644
--- a/webclient/app.js
+++ b/webclient/app.js
@@ -20,6 +20,7 @@ var matrixWebClient = angular.module('matrixWebClient', [
     'LoginController',
     'RoomController',
     'HomeController',
+    'RecentsController',
     'SettingsController',
     'UserController',
     'matrixService',