Merge branch '4.x' of https://github.com/craftcms/cms into 5.x · craftcms/cms@bec56cd · 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 Oct 8, 2024

2 parents aba3e4a + 6fea4bf commit bec56cd