diff options
author | tusooa <tusooa@kazv.moe> | 2022-07-13 04:42:24 +0000 |
---|---|---|
committer | tusooa <tusooa@kazv.moe> | 2022-07-13 04:42:24 +0000 |
commit | fdc71f6051bb5bcb4b7a00213540ffb1627441ab (patch) | |
tree | 57fa6b7ff6d1dc5192ece60a25d1ebb7d04c468e /test | |
parent | 311fda32f323419141f55be19f419a796e9375d3 (diff) | |
parent | eb2a1652bf3676de955a2912a42d50aa068131fa (diff) | |
download | pleroma-fdc71f6051bb5bcb4b7a00213540ffb1627441ab.tar.gz pleroma-fdc71f6051bb5bcb4b7a00213540ffb1627441ab.zip |
Merge branch 'short-description' into 'develop'
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
Diffstat (limited to 'test')
-rw-r--r-- | test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs index 9845408d6..13e3ffc0a 100644 --- 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" => %{ |