summary refs log tree commit diff
path: root/webclient/app.js
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-29 14:22:04 +0100
committerErik Johnston <erik@matrix.org>2014-08-29 14:22:04 +0100
commit8e2d4c6da55d2a21492f8610d595046f07d9887e (patch)
tree85ca2f67dd9552a3884d76d7d645adfb88e179e4 /webclient/app.js
parentCreate the correct events with the right configuration when creating a new room. (diff)
parentMerge branch 'release-v0.1.0' into develop (diff)
downloadsynapse-8e2d4c6da55d2a21492f8610d595046f07d9887e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'webclient/app.js')
-rw-r--r--webclient/app.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/webclient/app.js b/webclient/app.js
index 2d6624ceec..02695c3ae6 100644
--- a/webclient/app.js
+++ b/webclient/app.js
@@ -24,6 +24,8 @@ var matrixWebClient = angular.module('matrixWebClient', [
     'SettingsController',
     'UserController',
     'matrixService',
+    'matrixPhoneService',
+    'MatrixCall',
     'eventStreamService',
     'eventHandlerService',
     'infinite-scroll'