Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-04 05:54:59 -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

1
webclient/components/matrix/event-handler-service.js
View file

@ -95,7 +95,6 @@ angular.module('eventHandlerService', [])
$rootScope.$broadcast(PRESENCE_EVENT, event, isLiveEvent);
};
return {
MSG_EVENT: MSG_EVENT,
MEMBER_EVENT: MEMBER_EVENT,