From cc23a8b70b1537fd825e4e359f291f9e66019d45 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Tue, 9 Nov 2021 16:12:29 +0000
Subject: [PATCH] Server v2.6.4

---
 packages/server/package-lock.json | 4 ++--
 packages/server/package.json      | 2 +-
 readme/changelog_server.md        | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index 4bc2c672c6d..9f850962680 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@joplin/server",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@joplin/server",
-			"version": "2.6.3",
+			"version": "2.6.4",
 			"dependencies": {
 				"@aws-sdk/client-s3": "^3.40.0",
 				"@fortawesome/fontawesome-free": "^5.15.1",
diff --git a/packages/server/package.json b/packages/server/package.json
index 44e82e06059..93230adb3c7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "private": true,
   "scripts": {
     "start-dev": "npm run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
diff --git a/readme/changelog_server.md b/readme/changelog_server.md
index d66aa7bb3cd..98bdfa16a76 100644
--- a/readme/changelog_server.md
+++ b/readme/changelog_server.md
@@ -1,5 +1,9 @@
 # Joplin Server Changelog
 
+## [server-v2.6.4](https://github.com/laurent22/joplin/releases/tag/server-v2.6.4) - 2021-11-09T16:12:09Z
+
+- Improved: Allow storing item content in database, filesystem or S3 (depending on config) (#5602)
+
 ## [server-v2.6.3](https://github.com/laurent22/joplin/releases/tag/server-v2.6.3) - 2021-11-08T15:20:41Z
 
 - New: Add support for sharing notes when E2EE is enabled (#5529)