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

config/description.exs

@@ -536,6 +536,15 @@ config :pleroma, :config_description, [
           "Very cool instance"
         ]
       },
+      %{
+        key: :short_description,
+        type: :string,
+        description:
+          "Shorter version of instance description. It can be seen on `/api/v1/instance`",
+        suggestions: [
+          "Cool instance"
+        ]
+      },
       %{
         key: :limit,
         type: :integer,