Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-08-06 17:27:48 +02:00
80 changed files with 1254 additions and 686 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.0",
"engines": {
"node": ">=18"
},
@@ -90,7 +90,7 @@
"path-complete-extname": "^1.0.0",
"postcss": "^8.4.24",
"postcss-loader": "^4.3.0",
"postcss-preset-env": "^9.5.2",
"postcss-preset-env": "^10.0.0",
"prop-types": "^15.8.1",
"punycode": "^2.3.0",
"react": "^18.2.0",