Skip to content

Commit c21f9c0

Browse files
committed
Merge branch '1.11' into 1.12
* 1.11: [Composer] Remove unneeded branch-alias Generate changelog for v1.11.0
2 parents f07462e + b9fce22 commit c21f9c0

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## CHANGELOG
22

3+
## v1.11.0 (2024-08-29)
4+
35
## v1.11.0-RC.2 (2024-07-12)
46

57
#### Details
@@ -22,8 +24,7 @@
2224

2325
#### Details
2426

25-
- [#871](https://github.com/Sylius/SyliusResourceBundle/issues/871) Fix state machine tag ([@Zales0123](https://github.com/Zales0123))
26-
Working on Sylius/SyliusResourceBundle (branch 1.11)
27+
- [#871](https://github.com/Sylius/SyliusResourceBundle/issues/871) Fix state machine tag ([@Zales0123](https://github.com/Zales0123)) Working on Sylius/SyliusResourceBundle (branch 1.11)
2728

2829
## v1.11.0-BETA.1 (2024-04-19)
2930

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
"dealerdirect/phpcodesniffer-composer-installer": false
102102
}
103103
},
104-
"extra": {
105-
"branch-alias": {
106-
"dev-master": "1.10-dev"
107-
}
108-
},
109104
"autoload": {
110105
"psr-4": {
111106
"Sylius\\Bundle\\ResourceBundle\\": "src/Bundle/",

0 commit comments

Comments
 (0)