summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-19 16:26:46 +0100
committerDavid Baker <dbkr@matrix.org>2014-09-19 16:26:46 +0100
commit03ac0c91ae195b2931967c8c574017deaa77e7c2 (patch)
treeab8fcabb0d9c0f517405485e913d034048a1780e /scripts
parentSYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support all... (diff)
parentFirst working version of UI chrome for video calls. (diff)
downloadsynapse-03ac0c91ae195b2931967c8c574017deaa77e7c2.tar.xz
Merge branch 'videocalls' into develop
Conflicts:
	webclient/room/room.html
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions