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

2 parents c9bae3f + 4b05a2f commit 1da834e