Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges

2022-07-14 07:07:19 +02:00 · 2022-07-14 07:07:19 +02:00 · 44d14e8a9c
commit 44d14e8a9c
parent f88ed1df75 3fb9171694
13 changed files with 1218 additions and 189 deletions
--- a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
@ -22,6 +22,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
             "uri" => _,
             "title" => _,
             "description" => _,
+             "short_description" => _,
             "version" => _,
             "email" => from_config_email,
             "urls" => %{