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

pull/1/head
yflory 2017-11-06 15:49:46 +01:00
commit 0149347d1b
2 changed files with 2 additions and 2 deletions

View File

@ -76,7 +76,7 @@ define([
])
])
]),
h('div.cp-version-footer', "CryptPad v1.18.0 (Snallygaster)")
h('div.cp-version-footer', "CryptPad v1.19.0 (Tarasque)")
]);
};

View File

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