This repository has been archived by the owner on Nov 3, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/3.2.15' into hotfix/3.3.6
Conflicts: system/bin/txpurge system/config/constants.php system/docs/CHANGELOG.md system/modules/calendar/languages/sl/default.xlf system/modules/core/languages/es/tl_content.xlf system/modules/core/languages/fr/default.xlf system/modules/core/languages/fr/explain.xlf system/modules/core/languages/fr/tl_form_field.xlf system/modules/core/languages/fr/tl_page.xlf system/modules/core/languages/ja/tl_content.xlf system/modules/core/languages/ja/tl_module.xlf system/modules/core/languages/ja/tl_style.xlf system/modules/core/languages/my/default.xlf system/modules/core/languages/my/exception.xlf system/modules/core/languages/my/tl_content.xlf system/modules/core/languages/my/tl_files.xlf system/modules/core/languages/my/tl_form.xlf system/modules/core/languages/my/tl_form_field.xlf system/modules/core/languages/my/tl_install.xlf system/modules/core/languages/my/tl_settings.xlf system/modules/core/languages/my/tl_user.xlf system/modules/core/languages/ru/tl_files.xlf system/modules/core/languages/sk/tl_page.xlf system/modules/core/languages/sl/modules.xlf system/modules/core/languages/sl/tl_files.xlf system/modules/core/modules/ModuleArticle.php system/modules/core/modules/ModuleArticlenav.php
- Loading branch information