mirror of
https://github.com/Codappix/search_core.git
synced 2024-11-25 21:56:11 +01:00
Merge remote-tracking branch 'origin/develop' into feature/doc-cleanup
Conflicts: composer.json
This commit is contained in:
commit
de884128db
1 changed files with 1 additions and 1 deletions
|
@ -38,7 +38,7 @@
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-develop": "0.0.1"
|
"dev-develop": "1.0.x-dev"
|
||||||
},
|
},
|
||||||
"typo3/cms": {
|
"typo3/cms": {
|
||||||
"cms-package-dir": "{$vendor-dir}/typo3/cms",
|
"cms-package-dir": "{$vendor-dir}/typo3/cms",
|
||||||
|
|
Loading…
Reference in a new issue