David Baker 03ac0c91ae Merge branch 'videocalls' into develop ...

Conflicts:
	webclient/room/room.html

2014-09-19 16:26:46 +01:00

..

fileInput

SYWEB-13: disabled "Send image" button if the browser does not support HTML5 file API

2014-09-19 17:20:33 +02:00

fileUpload

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

matrix

Merge branch 'videocalls' into develop

2014-09-19 16:26:46 +01:00

utilities

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00