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

customize.dist/fsStore.js

@@ -135,6 +135,11 @@ define([
         if (typeof(f) === 'function') {
             f(void 0, store);
         }
+
+        if (typeof(proxy.allowUserFeedback) !== 'boolean') {
+            proxy.allowUserFeedback = true;
+        }
+
         proxy.on('change', [Cryptpad.displayNameKey], function (o, n, p) {
             if (typeof(n) !== "string") { return; }
             Cryptpad.changeDisplayName(n);

customize.dist/translations/messages.js

@@ -255,6 +255,7 @@ define(function () {
     out.settings_resetTips = "Tips in CryptDrive";
     out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
     out.settings_resetTipsDone = "All the tips are now visible again.";
+    out.settings_userFeedback = "disable user feedback";
 
     // index.html