Merge branch 'develop' into feature/add-display-name-to-facet

This commit is contained in:
Daniel Siepmann 2018-03-08 09:19:49 +01:00 committed by GitHub
commit e98b9ee4fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -37,6 +37,9 @@
] ]
}, },
"extra": { "extra": {
"branch-alias": {
"dev-develop": "1.0.x-dev"
},
"typo3/cms": { "typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms", "cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/web" "web-dir": ".Build/web"