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

2 parents a2e4204 + 10ec889 commit 73b226d