From 84ec8454995cfd7dd62a45c1df1e6ff19feee1d4 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 3 Nov 2021 11:34:14 +0000
Subject: [PATCH] CLI v2.6.1

---
 packages/app-cli/package-lock.json |  4 ++--
 packages/app-cli/package.json      |  2 +-
 readme/changelog_cli.md            | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/app-cli/package-lock.json b/packages/app-cli/package-lock.json
index fd38289dc7d..f1d3d6ea0bc 100644
--- a/packages/app-cli/package-lock.json
+++ b/packages/app-cli/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "joplin",
-	"version": "2.5.0",
+	"version": "2.6.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "joplin",
-			"version": "2.5.0",
+			"version": "2.6.1",
 			"license": "MIT",
 			"dependencies": {
 				"aws-sdk": "^2.588.0",
diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json
index 0dfd42993b8..00ed6d916d8 100644
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -33,7 +33,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.6.0",
+  "version": "2.6.1",
   "bin": {
     "joplin": "./main.js"
   },
diff --git a/readme/changelog_cli.md b/readme/changelog_cli.md
index fd5257e894e..42d2116c8e9 100644
--- a/readme/changelog_cli.md
+++ b/readme/changelog_cli.md
@@ -1,5 +1,19 @@
 # Joplin terminal app changelog
 
+## [cli-v2.6.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.6.1) - 2021-11-03T11:33:18Z
+
+- New: Add support for public-private key pairs and improved master password support (#5438)
+- New: Added mechanism to migrate default settings to new values (72db8e4)
+- Improved: Add Markdown + Front Matter exporter/importer (#5465) (#5224 by [@CalebJohn](https://github.com/CalebJohn))
+- Improved: Ensure that shared notebook children are not deleted when shared, unshared and shared again, and a conflict happens (ccf9882)
+- Improved: Improved Joplin Server configuration check to better handle disabled accounts (72c1235)
+- Improved: Improved handling of expired sessions when using Joplin Server (33249ca) (ace1118)
+- Fixed: Certain attachments were not being automatically deleted (#932)
+- Fixed: Fix default sync target (4b39d30)
+- Fixed: Fixed potential infinite loop when Joplin Server session is invalid (c5569ef)
+- Fixed: Fixed running out of memory when importing large ENEX files (#5543)
+- Fixed: Ignore newline between quotes while spliting batch (#5540) (#5341 by Kingsley Yung)
+
 ## [cli-v2.4.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.4.1) - 2021-09-29T15:28:01Z
 
 - New: Add a way to disable a master key (7faa58e)