From 10e68e3f00762dad933bc418d4939e047f1b01fd Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 23 Jul 2020 12:41:00 +0200
Subject: [PATCH] v4.2.6

---
 CHANGELOG.md      | 19 +++++++++++++++++++
 manifest.json     |  2 +-
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db1960846d..20852f6b7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# Changelog
+
+## v4.2.6
+
+### New
+- Add option for nested accounts
+- Revert "Allow syncing the same folder with multiple accounts"
+
+### Fixed
+- Try to fix unmapped children error
+- Sync algorithm: XOR createdUpstream with existingChildren
+- Update dependencies
+- NextcloudFolders: Improve error message on non-200 response
+- Update screenshots
+- SyncProcess: Fix concurrency for merging
+- NestedSync: Fix WebDAV and NextcloudLegacy
+- WebDAV: Give up faster when lock doesn't unlock
+- Permissions: We may need unlimited storage
+
 ## v4.2.5
 
 ### Fixed
diff --git a/manifest.json b/manifest.json
index 09369d5b71..8696514cea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "description": "Sync your bookmarks across browsers via Nextcloud, WebDAV or a local file (and thus any file sync solution)",
   "icons": {
     "48": "icons/logo.png",
diff --git a/package-lock.json b/package-lock.json
index 86d31ea0b2..e1e31e4189 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 46cafd5c12..789cc1aa19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "description": "Sync your bookmarks across browsers via Nextcloud, WebDAV or a local file (and thus any file sync solution)",
   "main": "index.js",
   "scripts": {