diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-13 14:37:43 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-13 14:37:43 +0000 |
| commit | cdb8d746efe602eb1b993a0310b4cf20c2a78995 (patch) | |
| tree | 38d8df3a56a5a415a4b24c98b7e6b2b38f24c76d /syweb/webclient/app.js | |
| parent | Kill ng-animate with fire because it's terrible (was causing the page to be v... (diff) | |
| parent | Add commands-service unit tests. (diff) | |
| download | synapse-cdb8d746efe602eb1b993a0310b4cf20c2a78995.tar.xz | |
Merge with Matthew's killing of ng-animate
Conflicts: syweb/webclient/app-controller.js syweb/webclient/index.html
Diffstat (limited to 'syweb/webclient/app.js')
| -rw-r--r-- | syweb/webclient/app.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/syweb/webclient/app.js b/syweb/webclient/app.js index 1a1be4bd06..9e5b85820d 100644 --- a/syweb/webclient/app.js +++ b/syweb/webclient/app.js @@ -32,6 +32,7 @@ var matrixWebClient = angular.module('matrixWebClient', [ 'notificationService', 'recentsService', 'modelService', + 'commandsService', 'infinite-scroll', 'ui.bootstrap', 'monospaced.elastic' |