summary refs log tree commit diff
path: root/webclient/app.js
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-27 16:54:12 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-27 16:54:12 +0100
commit1d95e78759cc1307d15d6cc6388f52063e833355 (patch)
tree0307617989016019bfd1d41a15b22499d02091ef /webclient/app.js
parentadd _get_room_member, fix datastore methods (diff)
parentAdded RestServlet for /rooms/$roomid/initialSync (diff)
downloadsynapse-1d95e78759cc1307d15d6cc6388f52063e833355.tar.xz
Merge branch 'develop' into storage_transactions
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',