From 8e641c4bb77e6a42b82dfb1e8119782b89fe1063 Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Thu, 1 Jun 2023 20:14:37 +0100
Subject: [PATCH 1/4] :bookmark: (23.6.0) category hiding and filters for
 reports

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 87d8e67ba..0ba786ec4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "actual-sync",
-  "version": "23.5.0",
+  "version": "23.6.0",
   "license": "MIT",
   "description": "actual syncing server",
   "type": "module",

From fb4e499771e83eb4a10b734bddc88f9f44b61bbe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 19:18:23 +0000
Subject: [PATCH 2/4] Remove used release notes

---
 upcoming-release-notes/204.md | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 upcoming-release-notes/204.md

diff --git a/upcoming-release-notes/204.md b/upcoming-release-notes/204.md
deleted file mode 100644
index aee22db1d..000000000
--- a/upcoming-release-notes/204.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [j-f1]
----
-
-Fix build process for edge Docker images

From 956906b53787ec96c1039970f1e019b8ceb0467b Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Thu, 1 Jun 2023 21:06:24 +0100
Subject: [PATCH 3/4] Upgrade

---
 package.json |  4 ++--
 yarn.lock    | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 0ba786ec4..dfe53b226 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
     "reset-password": "node src/scripts/reset-password.js"
   },
   "dependencies": {
-    "@actual-app/api": "6.0.0",
-    "@actual-app/web": "23.5.0",
+    "@actual-app/api": "6.1.0",
+    "@actual-app/web": "23.6.0",
     "bcrypt": "^5.1.0",
     "better-sqlite3": "^8.2.0",
     "body-parser": "^1.20.1",
diff --git a/yarn.lock b/yarn.lock
index d0f2bdbbf..8d0220af2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,21 +5,21 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@actual-app/api@npm:6.0.0":
-  version: 6.0.0
-  resolution: "@actual-app/api@npm:6.0.0"
+"@actual-app/api@npm:6.1.0":
+  version: 6.1.0
+  resolution: "@actual-app/api@npm:6.1.0"
   dependencies:
     better-sqlite3: ^8.2.0
     node-fetch: ^2.6.9
     uuid: 3.3.2
-  checksum: c0e579b03571258ca0ecdc67f3c05b1fed1d5b821f92cf4c0d7fb55040e75cbcd56372e0030e679b5f701404fb3b05e6e95516c6dd501ad1b98ab4e50a7cce49
+  checksum: 75eeb5fdb2377175117bf2a229883a23224c8272d20aeaa79c2f30d609206156b9c1a0a9d65d580454b52da86a3aa38ead24d44daac69e728604467b1194e985
   languageName: node
   linkType: hard
 
-"@actual-app/web@npm:23.5.0":
-  version: 23.5.0
-  resolution: "@actual-app/web@npm:23.5.0"
-  checksum: 9961c35c58efb52bed28eb0b25954e414f8d509a5633bf5153cbe9251f8325614208010fc91850001a96e2e67520d3fe973d87f32443d55d25390fbdee0ea142
+"@actual-app/web@npm:23.6.0":
+  version: 23.6.0
+  resolution: "@actual-app/web@npm:23.6.0"
+  checksum: a3bbfe54c9285f3d285b36a1fc57ec856d1af82ec66d4ae16e70031bb4279b213a4f214757f72dce087ff9f0537624c70c612726b0779e4c0525975f7aee0637
   languageName: node
   linkType: hard
 
@@ -1555,8 +1555,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "actual-sync@workspace:."
   dependencies:
-    "@actual-app/api": 6.0.0
-    "@actual-app/web": 23.5.0
+    "@actual-app/api": 6.1.0
+    "@actual-app/web": 23.6.0
     "@babel/preset-typescript": ^7.20.2
     "@types/bcrypt": ^5.0.0
     "@types/better-sqlite3": ^7.6.3

From 9de974ab79867384aecac9e10e159c520563d762 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 20:09:29 +0000
Subject: [PATCH 4/4] Remove used release notes

---
 upcoming-release-notes/208.md | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 upcoming-release-notes/208.md

diff --git a/upcoming-release-notes/208.md b/upcoming-release-notes/208.md
deleted file mode 100644
index 500cc8889..000000000
--- a/upcoming-release-notes/208.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [j-f1]
----
-
-Migrate to the combined release notes action from the main repo