Merge branch 'staging' into team

2019-09-23 11:35:20 +02:00
parent 4381ff8107 33623bdafc
commit 78022fa527
6 changed files with 411 additions and 48 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -103,7 +103,7 @@ define([
                    ])*/
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v3.1.0 (Baiji)")
+            h('div.cp-version-footer', "CryptPad v3.2.0 (Chilihueque)")
        ]);
    };