Skip to content

Commit bc01029

Browse files
author
roadiz-ci
committed
Merge tag v2.5.0 into develop
1 parent 9c64059 commit bc01029

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

composer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
"rezozero/intervention-request-bundle": "~4.0.0",
4444
"rezozero/liform-bundle": "^0.20.1",
4545
"rezozero/tree-walker": "^1.5.0",
46-
"roadiz/doc-generator": "2.5.x-dev",
47-
"roadiz/documents": "2.5.x-dev",
48-
"roadiz/dts-generator": "2.5.x-dev",
49-
"roadiz/entity-generator": "2.5.x-dev",
50-
"roadiz/jwt": "2.5.x-dev",
51-
"roadiz/markdown": "2.5.x-dev",
52-
"roadiz/models": "2.5.x-dev",
46+
"roadiz/doc-generator": "2.5.*",
47+
"roadiz/documents": "2.5.*",
48+
"roadiz/dts-generator": "2.5.*",
49+
"roadiz/entity-generator": "2.5.*",
50+
"roadiz/jwt": "2.5.*",
51+
"roadiz/markdown": "2.5.*",
52+
"roadiz/models": "2.5.*",
5353
"roadiz/nodetype-contracts": "^2.0.0",
54-
"roadiz/random": "2.5.x-dev",
54+
"roadiz/random": "2.5.*",
5555
"rollerworks/password-common-list": "^0.3.0",
5656
"rollerworks/password-strength-bundle": "^3.0",
5757
"scienta/doctrine-json-functions": "^4.2",
@@ -140,8 +140,8 @@
140140
},
141141
"extra": {
142142
"branch-alias": {
143-
"dev-main": "2.4.x-dev",
144-
"dev-develop": "2.5.x-dev"
143+
"dev-main": "2.5.x-dev",
144+
"dev-develop": "2.6.x-dev"
145145
}
146146
}
147147
}

config/services.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
parameters:
3-
roadiz_core.cms_version: '2.5.x-dev'
4-
roadiz_core.cms_version_prefix: 'develop'
3+
roadiz_core.cms_version: '2.5.0'
4+
roadiz_core.cms_version_prefix: 'main'
55
env(APP_NAMESPACE): "roadiz"
66
env(APP_VERSION): "0.1.0"
77
env(APP_USE_ACCEPT_LANGUAGE_HEADER): 'false'

0 commit comments

Comments
 (0)