diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
| commit | ef9c4476a0eb653637040f86dd900252cad30567 (patch) | |
| tree | ad14ecbbb2a03ceb47f8fba558994edd3d71b9df /webclient/app.js | |
| parent | Fix SQL so that accepts we may want to persist events twice. (diff) | |
| parent | SYWEB-12: Add a 'Room Info' button which displays all state content. (diff) | |
| download | synapse-ef9c4476a0eb653637040f86dd900252cad30567.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'webclient/app.js')
| -rw-r--r-- | webclient/app.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/app.js b/webclient/app.js index 31118304c6..099e2170a0 100644 --- a/webclient/app.js +++ b/webclient/app.js @@ -30,7 +30,8 @@ var matrixWebClient = angular.module('matrixWebClient', [ 'MatrixCall', 'eventStreamService', 'eventHandlerService', - 'infinite-scroll' + 'infinite-scroll', + 'ui.bootstrap' ]); matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider', |