Merge branch '4.x' of https://github.com/craftcms/cms into 5.x · craftcms/cms@c3518b8 · GitHub

Commit

Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

Browse files

# Conflicts:
#	src/config/app.php

Loading branch information

brandonkelly committed Aug 26, 2024

2 parents ac6cfb3 + 72fcd36 commit c3518b8