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

2018-11-20 15:01:17 +01:00
parent aa3f6cb7d7 04d96d5d0e
commit 56267f4ee1
4 changed files with 6 additions and 11 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -91,7 +91,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.11.0 (Lemur)")
+            h('div.cp-version-footer', "CryptPad v2.12.0 (Manatee)")
        ]);
    };