Merge branch 'develop' into '43-bootstrapping-the-ter-views'
# Conflicts: # composer.lock
.editorconfig
0 → 100644
... | ... | @@ -27,7 +27,7 @@ |
"helhum/typo3-console": "4.1.2", | ||
"dmitryd/typo3-realurl": "^2.1", | ||
"apache-solr-for-typo3/solr": "^6.0", | ||
"t3o/t3olayout": "dev-master" | ||
"t3o/t3olayout": "dev-develop" | ||
}, | ||
"config": { | ||
"bin-dir": "bin", | ||
... | ... |
Please register or sign in to comment