Merge branch 'staging' into team

2019-09-10 15:32:05 +02:00
parent 2d7f7b895d 7e238245e6
commit 798296489a
19 changed files with 185 additions and 91 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -103,7 +103,7 @@ define([
                    ])*/
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v3.0.1 (Aurochs' revenge)")
+            h('div.cp-version-footer', "CryptPad v3.1.0 (Baiji)")
        ]);
    };