David Baker 03ac0c91ae Merge branch 'videocalls' into develop ... Conflicts: webclient/room/room.html		2014-09-19 16:26:46 +01:00
..
room-controller.js	Merge branch 'videocalls' into develop	2014-09-19 16:26:46 +01:00
room-directive.js	…
room.html	Merge branch 'videocalls' into develop	2014-09-19 16:26:46 +01:00