Merge branch 'staging' into todo

2017-07-31 11:43:56 +02:00
parent 9734a4db80 a458d7fa46
commit 777dea2014
3 changed files with 3 additions and 3 deletions
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -112,7 +112,7 @@ $(function () {
                ])
            ])
        ]),
-        h('div.version-footer', "CryptPad v1.11.0 (Lutin)")
+        h('div.version-footer', "CryptPad v1.12.0 (Minotaur)")
    ]));

    var pathname = location.pathname;