Skip to content
  • pixeldesu's avatar
    Merge branch 'master' into develop-v9 · 7251c5ff
    pixeldesu authored
    # Conflicts:
    #	Configuration/PageTS/TCEFORM.tsconfig
    #	Configuration/TCA/Overrides/tt_content_ce_CaseStudyLogo.php
    #	Configuration/TCA/Overrides/tt_content_ce_TextWithTeaser.php
    #	Configuration/TypoScript/Includes/Gridelements.typoscript
    7251c5ff