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:
+1
-1
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user