Merge branch 'short-description' into 'develop'

Add short_description instance field Closes #2865 See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00 · 2022-07-13 04:42:24 +00:00 · fdc71f6051
commit fdc71f6051
parent 311fda32f3 eb2a1652bf
5 changed files with 13 additions and 0 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" => %{