From 2594530d9b0701e567941ac435de2cc65ac2bc18 Mon Sep 17 00:00:00 2001
From: Antoine Jaussoin <antoinejaussoin@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:32:01 +0000
Subject: [PATCH] Release v4.18.0

---
 README.md                | 6 ++++++
 backend/package.json     | 2 +-
 docs/package.json        | 2 +-
 frontend/package.json    | 2 +-
 integration/package.json | 2 +-
 integration/readme.md    | 2 +-
 package.json             | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4a6edc683..e4c5e975b 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,12 @@ This will run a demo version, which you can turn into a fully licenced version b
 
 ## Versions History
 
+### Version 4.18.0
+
+- Self-Hosted: Adding the ability to merge users (migrating their data into another user). This is only available for self-hosted instances, through the Administration panel (👏 Thanks to Frank Becker for the idea)
+- ⏫ Upgrade vulnerable dependencies (thanks to dependabot)
+- Fix issues found by code scanning (CodeQL)
+
 ### Version 4.17.0
 
 - Adding the ability to set administrators for a Pro subscription. An administrator can add and remove users from the Pro subscription, and be independent from the owner (who manages payments). Useful for resellers.
diff --git a/backend/package.json b/backend/package.json
index 9bcc89c4d..dc2636338 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/backend",
-  "version": "4.17.0",
+  "version": "4.18.0",
   "license": "GNU GPLv3",
   "private": true,
   "scripts": {
diff --git a/docs/package.json b/docs/package.json
index 2573ed7a0..2753e0724 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "4.17.0",
+  "version": "4.18.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
diff --git a/frontend/package.json b/frontend/package.json
index c542188df..e03797741 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/frontend",
-  "version": "4.17.0",
+  "version": "4.18.0",
   "license": "GNU GPLv3",
   "private": true,
   "dependencies": {
diff --git a/integration/package.json b/integration/package.json
index c8e31d686..92f17fca7 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "retro-board-integration",
-  "version": "4.17.0",
+  "version": "4.18.0",
   "description": "Integrations tests",
   "main": "index.js",
   "directories": {
diff --git a/integration/readme.md b/integration/readme.md
index 6fff0dd1e..4175d3db1 100644
--- a/integration/readme.md
+++ b/integration/readme.md
@@ -2,7 +2,7 @@
 
 ## What are they?
 
-They are tests, meants to be run on a production-like environement (using Docker), to ensure that it tests something as close as possible to production.
+They are tests, meant to be run on a production-like environment (using Docker), to ensure that it tests something as close as possible to production.
 
 It uses Cypress.
 
diff --git a/package.json b/package.json
index 1981daf56..4ba097cf9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "retrospected",
-  "version": "4.17.0",
+  "version": "4.18.0",
   "description": "An agile retrospective board - Powering www.retrospected.com",
   "private": true,
   "scripts": {