mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 03:00:33 +02:00
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:
@@ -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
|
||||
|
||||
@@ -45,7 +45,7 @@ module Mastodon
|
||||
|
||||
def api_versions
|
||||
{
|
||||
mastodon: 8,
|
||||
mastodon: 9,
|
||||
glitch: 1,
|
||||
}
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user