From c2cd1733cc2c80048e613901ec7517504917ce78 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Thu, 24 Jun 2021 08:26:20 +0100
Subject: [PATCH] Server v2.1.4

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

diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index 2677b08335..b3a7e4611c 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/server/package.json b/packages/server/package.json
index b2b3f81363..cc4136edb5 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "private": true,
   "scripts": {
     "start-dev": "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 5a9ab88809..7fb872a73f 100644
--- a/readme/changelog_server.md
+++ b/readme/changelog_server.md
@@ -1,5 +1,11 @@
 # Joplin Server Changelog
 
+## [server-v2.1.4-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.1.4-beta) (Pre-release) - 2021-06-24T07:26:03Z
+
+- Improved: Split permission to share note or folder (0c12c7f)
+- Fixed: Fixed handling of max item size for encrypted items (112157e)
+- Fixed: Fixed transaction locking issue when a sub-transaction fails (12aae48)
+
 ## [server-v2.1.3-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.1.3-beta) (Pre-release) - 2021-06-19T14:15:06Z
 
 - New: Add support for uploading multiple items in one request (3b9c02e)