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

2019-04-12 17:24:36 +02:00
parent 47cb776d6c 92d87787c9
commit 24c4029922
3 changed files with 46 additions and 1 deletions
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -132,7 +132,8 @@ module.exports = {
        'contact',
        'what-is-cryptpad',
        'features',
-        'faq'
+        'faq',
+        'maintenance'
    ],

    /* =====================