diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-10 18:35:05 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-10 18:35:05 +0200 |
commit | 44998ca4508c9ed13e563383f1209e7be6ee2e56 (patch) | |
tree | 90870576ecb61d488efb0d9c9ec7697d46ab98a1 /webclient/app.js | |
parent | Show echoed emote with transparency (diff) | |
parent | Animation on call end icon. (diff) | |
download | synapse-44998ca4508c9ed13e563383f1209e7be6ee2e56.tar.xz |
Merge remote-tracking branch 'origin/develop' into webclient_initialSync
Diffstat (limited to 'webclient/app.js')
-rw-r--r-- | webclient/app.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webclient/app.js b/webclient/app.js index d25e2a6234..9370f773b3 100644 --- a/webclient/app.js +++ b/webclient/app.js @@ -16,6 +16,7 @@ limitations under the License. var matrixWebClient = angular.module('matrixWebClient', [ 'ngRoute', + 'ngAnimate', 'MatrixWebClientController', 'LoginController', 'RegisterController', |