From 1f384c2a4af4952140e14809af3164e1da098046 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 3 Jul 2019 16:36:04 +0200
Subject: [PATCH 1/2] update version

---
 customize.dist/pages.js | 2 +-
 package.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 8a21fa233..3fd5e63bb 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -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)")
         ]);
     };
 
diff --git a/package.json b/package.json
index 2020d6df4..1a6462d84 100644
--- a/package.json
+++ b/package.json
@@ -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",

From 9e0fb966bfc983a1d6e4c18a4730881e4e35c526 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 4 Jul 2019 10:46:55 +0200
Subject: [PATCH 2/2] Fix cyclic object value

---
 www/common/proxy-manager.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 9d8bbe6ba..1257f3ad4 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -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);
             }