Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
This commit is contained in:
Claire
2026-05-30 12:13:35 +02:00
114 changed files with 1147 additions and 740 deletions
+1 -1
View File
@@ -182,7 +182,7 @@
"msw": "^2.12.1",
"msw-storybook-addon": "^2.0.6",
"oxfmt": "^0.47.0",
"playwright": "^1.57.0",
"playwright": "^1.60.0",
"react-test-renderer": "^18.2.0",
"storybook": "^10.3.0",
"stylelint": "^17.0.0",