Merge branch 'staging' into notifications
commit
b548d30afe
|
@ -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)")
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue