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

2017-06-28 17:15:42 +02:00
parent 19ff8a345d c53ebe3598
commit 877c5a8d0e
10 changed files with 19 additions and 1512 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1622,7 +1622,10 @@ define([
                        common.arePinsSynced(function (err, yes) {
                            if (!yes) {
                                common.resetPins(function (err) {
-                                    if (err) { console.error(err); }
+                                    if (err) {
+                                        console.error("Pin Reset Error");
+                                        return console.error(err);
+                                    }
                                    console.log('RESET DONE');
                                });
                            }