Merge branch 'features-page' into staging

2018-06-12 11:48:43 +02:00
parent c803b70a1a 6e6020ef0d
commit 4701a7f415
15 changed files with 418 additions and 321 deletions
@@ -771,7 +771,7 @@ define(function () {

    out.faq_link = "FAQ";
    out.faq_title = "Foire Aux Questions";
-    out.faq_whatis = "Qu'est-ce que CryptPad ?";
+    out.faq_whatis = "Qu'est-ce que <span class='cp-brand-font'>CryptPad</span> ?";
    out.faq = {};
    out.faq.keywords = {
        title: 'Termes spéciaux',