David Baker 03ac0c91ae Merge branch 'videocalls' into develop ... Conflicts: webclient/room/room.html		2014-09-19 16:26:46 +01:00
..
event-handler-service.js	Oops. Removed dev logs	2014-09-18 17:48:20 +02:00
event-stream-service.js	SYWEB-14: BF: rooms invitations were not visible in recents after launching/refreshing the web page	2014-09-18 17:34:26 +02:00
matrix-call.js	Merge branch 'videocalls' into develop	2014-09-19 16:26:46 +01:00
matrix-filter.js	A kind of the typo in the fix of SYWEB-44	2014-09-19 09:25:51 +02:00
matrix-phone-service.js	Time out calls from both ends properly.	2014-09-16 15:26:22 +01:00
matrix-service.js	Be consistent when associating keys with login types for registration/login.	2014-09-15 15:38:29 +01:00
presence-service.js	fix desktop notifs, which were broken in eab463fd	2014-09-08 11:28:51 +02:00