Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-05-18 18:51:21 +02:00
parent 814c81fb13 2cee9534c5
commit 2082b328b4
3 changed files with 64 additions and 6 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1357,7 +1357,7 @@ define([
                feedback("NO_PROXIES");
            }

-            if (!/CRYPTPAD_SHIM/.test(Array.isArray.toString())) {
+            if (/CRYPTPAD_SHIM/.test(Array.isArray.toString())) {
                feedback("NO_ISARRAY");
            }