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

2 parents 4f8a70b + cdad4c1 commit 038acd0