Skip to content
Permalink
Branch: master
Commits on Oct 1, 2019
  1. Merge branch '4.8'

    leofeyer committed Oct 1, 2019
    # Conflicts:
    #	calendar-bundle/src/Resources/contao/classes/Events.php
    #	calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php
    #	calendar-bundle/src/Resources/contao/modules/ModuleCalendar.php
    #	calendar-bundle/src/Resources/contao/modules/ModuleEventReader.php
    #	comments-bundle/src/Resources/contao/dca/tl_content.php
    #	comments-bundle/src/Resources/contao/dca/tl_module.php
    #	composer.json
    #	core-bundle/src/Resources/contao/classes/Backend.php
    #	core-bundle/src/Resources/contao/classes/Versions.php
    #	core-bundle/src/Resources/contao/dca/tl_content.php
    #	core-bundle/src/Resources/contao/dca/tl_files.php
    #	core-bundle/src/Resources/contao/dca/tl_image_size.php
    #	core-bundle/src/Resources/contao/dca/tl_member.php
    #	core-bundle/src/Resources/contao/dca/tl_opt_in.php
    #	core-bundle/src/Resources/contao/dca/tl_page.php
    #	core-bundle/src/Resources/contao/dca/tl_undo.php
    #	core-bundle/src/Resources/contao/drivers/DC_Folder.php
    #	core-bundle/src/Resources/contao/drivers/DC_Table.php
    #	core-bundle/src/Resources/contao/forms/FormCaptcha.php
    #	core-bundle/src/Resources/contao/helper/functions.php
    #	core-bundle/src/Resources/contao/library/Contao/Automator.php
    #	core-bundle/src/Resources/contao/library/Contao/Database/Installer.php
    #	core-bundle/src/Resources/contao/library/Contao/Database/Updater.php
    #	core-bundle/src/Resources/contao/library/Contao/Input.php
    #	core-bundle/src/Resources/contao/pages/PageRegular.php
    #	core-bundle/src/Resources/contao/widgets/FileTree.php
    #	core-bundle/src/Resources/contao/widgets/PageTree.php
    #	monorepo.yml
You can’t perform that action at this time.