Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
This commit is contained in:
Claire
2026-02-27 21:25:37 +01:00
86 changed files with 1440 additions and 273 deletions

View File

@@ -45,7 +45,7 @@ module Mastodon
def api_versions
{
mastodon: 7,
mastodon: 8,
glitch: 1,
}
end