Merge remote-tracking branch 'origin/support' into notifications

2019-06-25 16:44:55 +02:00
parent 5601e50511 22c9af6961
commit a62f2ff003
14 changed files with 562 additions and 11 deletions
--- a/www/common/common-constants.js
+++ b/www/common/common-constants.js
@@ -17,6 +17,6 @@ define(function () {
        // Sub
        plan: 'CryptPad_plan',
        // Apps
-        criticalApps: ['profile', 'settings', 'debug', 'admin', 'notifications']
+        criticalApps: ['profile', 'settings', 'debug', 'admin', 'support', 'notifications']
    };
 });