Merge branch 'master' into staging

2018-08-27 15:10:00 +02:00
parent 294fa38137 9fe78dcc5f
commit 62817d09cb
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -94,7 +94,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.5.0 (Fossa)")
+            h('div.cp-version-footer', "CryptPad v2.6.0 (Gibbon)")
        ]);
    };