Skip to content

Commit

Permalink
Merge branch release/v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
roadiz-ci committed Mar 6, 2023
1 parent a218f18 commit 40724f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down

0 comments on commit 40724f7

Please sign in to comment.