summary refs log tree commit diff
path: root/webclient/app.js
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-15 17:50:27 +0100
committerErik Johnston <erik@matrix.org>2014-08-15 17:50:27 +0100
commit7f5c7ddea9db879e500a48b47ad4f782d2d8416b (patch)
tree3332c614902b5641451da530ac9d2a3bed538a15 /webclient/app.js
parentFix some of the tests to reflect changes in the storage layer. (diff)
parentGet presence for members when you enter a room (it was coming down but wasn't... (diff)
downloadsynapse-7f5c7ddea9db879e500a48b47ad4f782d2d8416b.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'webclient/app.js')
-rw-r--r--webclient/app.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/app.js b/webclient/app.js

index 6e0351067f..58d3942c65 100644 --- a/webclient/app.js +++ b/webclient/app.js
@@ -22,7 +22,8 @@ var matrixWebClient = angular.module('matrixWebClient', [ 'RoomsController', 'matrixService', 'eventStreamService', - 'eventHandlerService' + 'eventHandlerService', + 'infinite-scroll' ]); matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',