Merge branch 'bump-mastoapi' into 'develop'

Bump Mastodon API level

See merge request pleroma/pleroma!1146
This commit is contained in:
kaniini 2019-05-13 21:07:50 +00:00
commit 119b758412

View file

@ -178,7 +178,7 @@ def user(%{assigns: %{user: for_user}} = conn, %{"id" => nickname_or_id}) do
end end
end end
@mastodon_api_level "2.6.5" @mastodon_api_level "2.7.2"
def masto_instance(conn, _params) do def masto_instance(conn, _params) do
instance = Config.get(:instance) instance = Config.get(:instance)