Merge branch 'develop' into 5.8-dev

# Conflicts:
#	composer.lock
This commit is contained in:
James Cole 2022-06-06 17:41:34 +02:00
commit 46e97f95f9
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80

View File

@ -102,7 +102,7 @@
"psr/log": "<4", "psr/log": "<4",
"ramsey/uuid": "^4.3", "ramsey/uuid": "^4.3",
"rcrowe/twigbridge": "^0.14", "rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.7", "spatie/data-transfer-object": "^3.8",
"spatie/laravel-ignition": "^1.2", "spatie/laravel-ignition": "^1.2",
"symfony/http-client": "^6.0", "symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0" "symfony/mailgun-mailer": "^6.0"