synapse-product/webclient/room
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 BF: tab completion did not work with commands. $scope.input contained only the typed chars not the result of the completion. 2014-09-05 18:46:34 +02:00
room.html Merge branch 'videocalls' into develop 2014-09-19 16:26:46 +01:00