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

2 parents 444626e + 81cd6ce commit 8454518