diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d2d28342a81587602e6f84a7bab5f2c4ef00680..ff0f2b11db8d270ede26780bb75dcf919040ea13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,11 @@
 - No modifications / Keep major and minors versions in sync with all parts of the project
 -->
 
+## 4.2.0 (Upcoming)
+
+### ✨ Feature
+- Add support for tags on assignments and exercises
+
 
 ## 4.1.1 (2024-05-28)
 
@@ -27,7 +32,7 @@
 ## 4.1.0 (2024-05-28)
 
 ### ✨ Feature
-- Add features related to corrige (commentary, commit specific link / update, delete link)
+- Add features related to corrige (commentary, commit a specific link / update, delete link)
 
 ### 🎨 Interface
 - Ask for confirmation before creating an exercise that already exists
diff --git a/NodeApp/.idea/material_theme_project_new.xml b/NodeApp/.idea/material_theme_project_new.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d8084f3aa2a34d701302528b05104bac64d7bc07
--- /dev/null
+++ b/NodeApp/.idea/material_theme_project_new.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="userId" value="104e8585:19002424fea:-7f91" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/NodeApp/package-lock.json b/NodeApp/package-lock.json
index 6bb6f37914629570747b79e26795d2aa055cc242..407e5f0faba574e4d0bc00dc9a606e2fc126087e 100644
--- a/NodeApp/package-lock.json
+++ b/NodeApp/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "dojo_cli",
-    "version": "4.1.1",
+    "version": "4.2.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "dojo_cli",
-            "version": "4.1.1",
+            "version": "4.2.0",
             "license": "AGPLv3",
             "dependencies": {
                 "@dotenvx/dotenvx": "^0.44.1",
diff --git a/NodeApp/package.json b/NodeApp/package.json
index b6155d914200399fedf4c430cd13d65757a80cb9..2bad118b89ede5c0f0a450cb6fa1b63c162cd06c 100644
--- a/NodeApp/package.json
+++ b/NodeApp/package.json
@@ -1,7 +1,7 @@
 {
     "name"           : "dojo_cli",
     "description"    : "CLI of the Dojo project",
-    "version"        : "4.1.1",
+    "version"        : "4.2.0",
     "license"        : "AGPLv3",
     "author"         : "Michaël Minelli <dojo@minelli.me>",
     "main"           : "dist/app.js",