From 78d5fd1385fcb93582bc87cefa7f09fd265f39a5 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sat, 28 Aug 2021 18:46:45 +0100
Subject: [PATCH] Server v2.4.2

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

diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index a66e660d7..6d85ad4cb 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@joplin/server",
-	"version": "2.4.1",
+	"version": "2.4.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@joplin/server",
-			"version": "2.4.1",
+			"version": "2.4.2",
 			"dependencies": {
 				"@fortawesome/fontawesome-free": "^5.15.1",
 				"@koa/cors": "^3.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index f066723c7..76d3d1941 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "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 bad93e8d0..c28498bb3 100644
--- a/readme/changelog_server.md
+++ b/readme/changelog_server.md
@@ -1,10 +1,11 @@
 # Joplin Server Changelog
 
-## [server-v2.4.1-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.4.1-beta) (Pre-release) - 2021-08-23T08:52:28Z
+## [server-v2.4.2](https://github.com/laurent22/joplin/releases/tag/server-v2.4.2) - 2021-08-28T17:45:41Z
 
 - New: Add request rate limter on session and login end points (543413d)
 - New: Add support for user flags (82b157b)
 - New: Added commands to control db migrations - list, down, up (2c79ce2)
+- Improved: Display user flags in profile when logged in as admin (4394329)
 - Improved: Handle flags for accounts over limit (6e087bc)
 - Improved: Increase cookies security - set HttpOnly, Secure and SameSite flags (bcadb36)
 - Improved: No longer install vim into the image (#5337 by [@piotrb](https://github.com/piotrb))