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

2017-08-16 11:29:59 +02:00
parent d6125d864c a39f802b4d
commit 4213d6de70
5 changed files with 12 additions and 34 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -46,7 +46,9 @@ define([
            h('div.container', [
                h('div.row', [
                    footerCol(null, [
-                        setHTML(h('div.cp-bio-foot'), '<p>With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.</p>'),
+                        h('div.cp-bio-foot', [
+                            h('p', Msg.main_footerText)
+                        ])
                    ], ''),
                   /* footerCol(null, [
                        footLink('/about.html', 'about'),