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

2018-03-08 15:06:30 +01:00
parent ec19b82609 b1b9683141
commit 82329dbe70
7 changed files with 169 additions and 50 deletions
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -765,6 +765,7 @@ define(function () {

    out.faq_link = "FAQ";
    out.faq_title = "Frequently Asked Questions";
+    out.faq_whatis = "What is CryptPad?";
    out.faq = {};
    out.faq.keywords = {
        title: 'Keywords',