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

pull/1/head
yflory 2018-02-27 17:39:27 +01:00
commit f0bc1cfe99
2 changed files with 2 additions and 2 deletions

View File

@ -72,7 +72,7 @@ define([
])
])
]),
h('div.cp-version-footer', "CryptPad v1.26.0 (undefined)")
h('div.cp-version-footer', "CryptPad v1.27.0 (null)")
]);
};

View File

@ -1,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "1.26.0",
"version": "1.27.0",
"dependencies": {
"chainpad-server": "^2.0.0",
"express": "~4.10.1",