Merge remote-tracking branch 'origin/develop' into feature/doc-cleanup

Conflicts:
    composer.json
This commit is contained in:
Daniel Siepmann 2018-03-08 11:37:10 +01:00
commit de884128db
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4

View file

@ -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",