Skip to content
Permalink
Branch: master
Commits on Apr 11, 2019
  1. Merge branch '4.7'

    leofeyer committed Apr 11, 2019
    # Conflicts:
    #	CHANGELOG.md
    #	core-bundle/src/Resources/contao/config/constants.php
    #	core-bundle/src/Resources/contao/languages/ru/default.xlf
    #	core-bundle/src/Resources/contao/languages/ru/tl_opt_in.xlf
    #	core-bundle/tests/Image/PictureFactoryTest.php
  2. Merge branch '4.4' into 4.7

    leofeyer committed Apr 11, 2019
    # Conflicts:
    #	CHANGELOG.md
    #	core-bundle/src/Resources/contao/config/constants.php
    #	core-bundle/src/Resources/contao/dca/tl_content.php
    #	core-bundle/src/Resources/contao/dca/tl_form_field.php
Commits on Apr 9, 2019
  1. Merge branch '4.7'

    leofeyer committed Apr 9, 2019
    # Conflicts:
    #	CHANGELOG.md
    #	core-bundle/src/Resources/contao/config/constants.php
    #	core-bundle/src/Resources/contao/languages/cs/default.xlf
    #	core-bundle/src/Resources/contao/languages/cs/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/de/default.xlf
    #	core-bundle/src/Resources/contao/languages/de/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/es/default.xlf
    #	core-bundle/src/Resources/contao/languages/es/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/fa/default.xlf
    #	core-bundle/src/Resources/contao/languages/fa/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/fr/default.xlf
    #	core-bundle/src/Resources/contao/languages/fr/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/it/default.xlf
    #	core-bundle/src/Resources/contao/languages/it/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/ja/default.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/nl/default.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/pl/default.xlf
    #	core-bundle/src/Resources/contao/languages/pl/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/ru/default.xlf
    #	core-bundle/src/Resources/contao/languages/ru/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/sl/default.xlf
    #	core-bundle/src/Resources/contao/languages/sl/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/sr/default.xlf
    #	core-bundle/src/Resources/contao/languages/sr/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/zh/default.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_opt_in.xlf
You can’t perform that action at this time.