Merge branch 'maybe' into staging

2017-03-02 17:09:06 +01:00
parent 2b6e44189d c884782d57
commit 01c4d7d4a7
47 changed files with 183 additions and 289 deletions
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -171,7 +171,7 @@ define([
                }
                obj.proxy.drive = Cryptpad.getStore().getEmptyObject();
                Cryptpad.alert(Messages.settings_resetDone);
-            });
+            }, undefined, true);
        });

        return $div;