From 40724f761a5031b769d3ae0e49d89ac7fda5e268 Mon Sep 17 00:00:00 2001
From: roadiz-ci <ambroise+ci@roadiz.io>
Date: Mon, 6 Mar 2023 18:39:29 +0000
Subject: [PATCH] Merge branch release/v2.1.0

---
 CHANGELOG.md  | 4 ++++
 composer.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da39272..8e30cc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1 and newer
+
+Since v2.1 all changelog entries are merged into [Roadiz monorepo](https://github.com/roadiz/core-bundle-dev-app/blob/main/CHANGELOG.md)
+
 ## 2.0.0 (2022-06-28)
 
 ### Features
diff --git a/composer.json b/composer.json
index e306044..7a28588 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.0.x-dev",
+            "dev-main": "2.1.x-dev",
             "dev-develop": "2.2.x-dev"
         }
     }