Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-06 09:34:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'voip' into develop

Browse source 
Conflicts:
	webclient/room/room-controller.js
This commit is contained in:
David Baker 2014-08-29 11:33:36 +01:00
commit 171d8b032f
7 changed files with 379 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webclient/app.js
View file

@ -24,6 +24,8 @@ var matrixWebClient = angular.module('matrixWebClient', [
'SettingsController',
'UserController',
'matrixService',
'matrixPhoneService',
'MatrixCall',
'eventStreamService',
'eventHandlerService',
'infinite-scroll'