summary refs log tree commit diff
path: root/webclient/index.html
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-15 16:21:13 +0100
committerErik Johnston <erik@matrix.org>2014-08-15 16:21:13 +0100
commita17b371384ef5e09f20415258bdcb7ddd53ce20c (patch)
tree5a355c437c0f2bafdace0b80d3d9f1984409b6a0 /webclient/index.html
parentPEP8 cleanups (diff)
parentFix imsync's SELECT query to only find the rooms I'm actually joined in, not ... (diff)
downloadsynapse-a17b371384ef5e09f20415258bdcb7ddd53ce20c.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
	synapse/storage/roommember.py
Diffstat (limited to 'webclient/index.html')
-rw-r--r--webclient/index.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/webclient/index.html b/webclient/index.html
index e62ec39669..31b62efaa8 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -14,6 +14,8 @@
     <script src="room/room-controller.js"></script>
     <script src="rooms/rooms-controller.js"></script>
     <script src="components/matrix/matrix-service.js"></script>
+    <script src="components/matrix/event-stream-service.js"></script>
+    <script src="components/matrix/event-handler-service.js"></script>
     <script src="components/fileInput/file-input-directive.js"></script>
     <script src="components/fileUpload/file-upload-service.js"></script>
 </head>