synapse/webclient/room
David Baker 171d8b032f Merge branch 'voip' into develop
Conflicts:
	webclient/room/room-controller.js
2014-08-29 11:33:36 +01:00
..
room-controller.js Merge branch 'voip' into develop 2014-08-29 11:33:36 +01:00
room-directive.js rename autoComplete directive as tabComplete to avoid confusion with the autocomplete html attribute 2014-08-22 01:33:05 +01:00
room.html Merge branch 'voip' into develop 2014-08-29 11:33:36 +01:00