Merge branch 'develop'

This commit is contained in:
Björn Fromme
2021-09-07 21:28:21 +02:00
2 changed files with 12 additions and 12 deletions
@@ -1,5 +1,5 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TSconfig/Page/RTE.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TSconfig/Page/TCEFORM.tsconfig">
@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'
@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig'
@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'
@import 'EXT:ep_events/Configuration/TSconfig/Page/RTE.tsconfig'
@import 'EXT:ep_events/Configuration/TSconfig/Page/TCEFORM.tsconfig'
@@ -1,7 +1,7 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/Mod/SHARED.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/RTE.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig">
@import 'EXT:ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig'
@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'
@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig'
@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'
@import 'EXT:ep_theme/Configuration/TSconfig/Page/RTE.tsconfig'
@import 'EXT:ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig'
@import 'EXT:ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig'