Merge branch 'release-2.5' into dev

adarsh-sgh · Nov 2, 2021 · 08ee2b2 · 08ee2b2
2 parents b5d792c + 57b8aa1
commit 08ee2b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.5.9",
+  "version": "2.5.10",
   "private": true,
   "scripts": {
     "start-dev": "npm run build && 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
@@ -1,5 +1,10 @@
 # Joplin Server Changelog
 
+## [server-v2.5.10](https://github.com/laurent22/joplin/releases/tag/server-v2.5.10) - 2021-11-02T14:45:54Z
+
+- New: Add unique constraint on name and owner ID of items table (f7a18ba)
+- Fixed: Fixed issue that could cause server to return empty items in some rare cases (99ea4b7)
+
 ## [server-v2.5.9](https://github.com/laurent22/joplin/releases/tag/server-v2.5.9) - 2021-10-28T19:43:41Z
 
 - Improved: Remove session expiration for now (4a2af32)