Merge branch 'videocalls' into develop

Conflicts:
	webclient/room/room.html

1 files changed, 7 insertions, 0 deletions

diff --git a/webclient/room/room.html b/webclient/room/room.html

index 1fe83c03ea..07b74248a8 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -183,6 +183,13 @@
                         >
                     Voice Call
                 </button>
+                <button ng-click="startVideoCall()"
+                        ng-show="(currentCall == undefined || currentCall.state == 'ended') && memberCount() == 2"
+                        ng-disabled="state.permission_denied || !state.webRTCSupported"
+                        title ="{{ state.webRTCNotSupported ? '' : 'VoIP requires webRTC but your browser does not support it.'}}"
+                        >
+                    Video Call
+                </button>
             </div>
         
             {{ feedback }}