# Conflicts:
#	comments-bundle/src/Resources/contao/dca/tl_comments.php
#	composer.json
#	core-bundle/composer.json
#	core-bundle/src/Resources/contao/dca/tl_article.php
#	core-bundle/src/Resources/contao/dca/tl_member.php
#	core-bundle/src/Resources/contao/dca/tl_page.php
#	core-bundle/src/Resources/contao/dca/tl_user.php
#	core-bundle/src/Resources/contao/drivers/DC_Table.php
#	core-bundle/src/Resources/contao/elements/ContentDownloads.php
#	core-bundle/src/Resources/contao/elements/ContentGallery.php
#	core-bundle/src/Resources/contao/library/Contao/Controller.php
#	core-bundle/src/Resources/contao/library/Contao/Email.php
#	core-bundle/src/Resources/contao/modules/ModuleCustomnav.php
#	core-bundle/src/Resources/contao/modules/ModuleNavigation.php
#	core-bundle/src/Resources/contao/modules/ModuleQuicklink.php
#	core-bundle/src/Resources/contao/modules/ModuleSitemap.php
#	core-bundle/src/Resources/contao/pages/PageRegular.php
#	core-bundle/src/Routing/Matcher/LegacyMatcher.php
#	core-bundle/tests/Image/ImageSizesTest.php