Commit 33e42da1 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into '81-create-events-latest-template-for-start-page'

# Conflicts:
#   html/typo3conf/ext/t3org_layout/Configuration/TypoScript/Default/constants.txt
parents 016612ec 4f2da157
Pipeline #1679 passed with stages
in 3 minutes and 8 seconds
......@@ -16,5 +16,8 @@ plugin.tx_certifications.persistence.storagePid = 212
plugin.tx_t3omembership.persistence.storagePid = 227
plugin.tx_typo3roadmap.persistence.storagePid = 228
# Events
# Events settings
plugin.tx_sfeventmgt.settings.detailPid = 230
# News Settings
plugin.tx_news.settings.detailPid = 185
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment