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

    leofeyer committed Sep 5, 2019
    # Conflicts:
    #	CHANGELOG.md
    #	calendar-bundle/src/Resources/contao/languages/zh/tl_calendar.xlf
    #	calendar-bundle/src/Resources/contao/languages/zh/tl_calendar_events.xlf
    #	calendar-bundle/src/Resources/contao/languages/zh/tl_calendar_feed.xlf
    #	core-bundle/src/Resources/config/services.yml
    #	core-bundle/src/Resources/contao/config/constants.php
    #	core-bundle/src/Resources/contao/languages/ja/default.xlf
    #	core-bundle/src/Resources/contao/languages/ja/exception.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_form.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_form_field.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_page.xlf
    #	core-bundle/src/Resources/contao/languages/nl/default.xlf
    #	core-bundle/src/Resources/contao/languages/nl/exception.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_form_field.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_image_size_item.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_layout.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_maintenance.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_style_sheet.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_theme.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_undo.xlf
    #	core-bundle/src/Resources/contao/languages/zh/countries.xlf
    #	core-bundle/src/Resources/contao/languages/zh/default.xlf
    #	core-bundle/src/Resources/contao/languages/zh/exception.xlf
    #	core-bundle/src/Resources/contao/languages/zh/modules.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_article.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_content.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_files.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_form.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_form_field.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_image_size.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_image_size_item.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_layout.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_maintenance.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_member.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_member_group.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_module.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_opt_in_related.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_page.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_settings.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_style.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_style_sheet.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_templates.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_theme.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_undo.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_user.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_user_group.xlf
    #	faq-bundle/src/Resources/contao/languages/zh/tl_faq.xlf
    #	faq-bundle/src/Resources/contao/languages/zh/tl_faq_category.xlf
    #	installation-bundle/src/Resources/translations/messages.ja.xlf
    #	installation-bundle/src/Resources/translations/messages.nl.xlf
    #	installation-bundle/src/Resources/translations/messages.zh.xlf
    #	news-bundle/src/Resources/contao/languages/nl/tl_news.xlf
    #	news-bundle/src/Resources/contao/languages/zh/tl_news.xlf
    #	news-bundle/src/Resources/contao/languages/zh/tl_news_archive.xlf
    #	news-bundle/src/Resources/contao/languages/zh/tl_news_feed.xlf
    #	newsletter-bundle/src/Resources/contao/languages/cs/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/de/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/es/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/fr/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/it/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/ja/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/lv/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/nl/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/pl/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/pt/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/ru/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/sl/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/sr/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/tr/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/zh/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/zh/tl_newsletter_channel.xlf
    #	newsletter-bundle/src/Resources/contao/languages/zh/tl_newsletter_recipients.xlf
You can’t perform that action at this time.