web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into soon

Browse Source
This commit is contained in:
ansuz 2019-01-14 15:33:29 +01:00
commit 724e4e39f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -36,7 +36,7 @@
"alertifyjs": "1.0.11", "alertifyjs": "1.0.11",
"scrypt-async": "1.2.0", "scrypt-async": "1.2.0",
"require-css": "0.1.10", "require-css": "0.1.10",
"less": "^3.7.1", "less": "3.7.1",
"bootstrap": "^v4.0.0", "bootstrap": "^v4.0.0",
"diff-dom": "2.1.1", "diff-dom": "2.1.1",
"nthen": "^0.1.5", "nthen": "^0.1.5",

4
www/common/cryptpad-common.js
View File

@ -1112,11 +1112,11 @@ define([
}; };
common.isWebRTCSupported = function () { common.isWebRTCSupported = function () {
return navigator.getUserMedia || return Boolean(navigator.getUserMedia ||
navigator.webkitGetUserMedia || navigator.webkitGetUserMedia ||
navigator.mozGetUserMedia || navigator.mozGetUserMedia ||
navigator.msGetUserMedia || navigator.msGetUserMedia ||
window.RTCPeerConnection; window.RTCPeerConnection);
}; };
common.ready = (function () { common.ready = (function () {