Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2020-02-10 16:39:06 +01:00
@@ -172,3 +172,4 @@ plugin.tx_eptheme {
@import "EXT:gridelements/Configuration/TypoScript/constants.typoscript"
@import "EXT:pxa_social_feed/Configuration/TypoScript/constants.txt"
@import "EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript"
@import "EXT:typo3_encore/Configuration/TypoScript/constants.typoscript"