Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
This commit is contained in:
Claire committed 2026-03-16 18:16:56 +01:00
commit 73f77c49d8
138 files changed
+1258 -307

No files matched your search

+1 -1
View File
@@ -214,7 +214,7 @@ module Mastodon::CLI
def stats_to_json(stats)
stats.compact!
say(Oj.dump(stats))
say(stats.to_json)
end
end
end
+1 -1
View File
@@ -45,7 +45,7 @@ module Mastodon
def api_versions
{
mastodon: 8,
mastodon: 9,
glitch: 1,
}
end