Merge branch 'staging' into notifications

pull/1/head
yflory 2019-07-04 10:56:43 +02:00
commit b548d30afe
3 changed files with 5 additions and 2 deletions

View File

@ -103,7 +103,7 @@ define([
])*/
])
]),
h('div.cp-version-footer', "CryptPad v2.24.0 (Yak)")
h('div.cp-version-footer', "CryptPad v2.25.0 (Zebra)")
]);
};

View File

@ -1,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "2.24.0",
"version": "2.25.0",
"license": "AGPL-3.0+",
"repository": {
"type": "git",

View File

@ -252,6 +252,9 @@ define([
var obj = Env.folders[el].proxy.metadata || {};
if (obj) { key = obj.title; }
} else {
try {
el = JSON.parse(JSON.stringify(el));
} catch (e) { return undefined; }
userObject.getFilesRecursively(el, files);
}