Merge branch 'develop' into 5.8-dev

# Conflicts:
#	frontend/package.json
#	frontend/yarn.lock
This commit is contained in:
James Cole
2022-06-04 21:05:56 +02:00
133 changed files with 1143 additions and 14459 deletions

View File

@@ -203,6 +203,9 @@
]
},
"config": {
"platform": {
"php": "8.0.19"
},
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true,