Merge branch 'develop' into 'bookmark-folders'

# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md

1 files changed, 14 insertions, 0 deletions

diff --git a/config/description.exs b/config/description.exs
index 78e7710cb..7a9c027de 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -567,6 +567,20 @@ config :pleroma, :config_description, [
         ]
       },
       %{
+        key: :status_page,
+        type: :string,
+        description: "A page where people can see the status of the server during an outage",
+        suggestions: [
+          "https://status.pleroma.example.org"
+        ]
+      },
+      %{
+        key: :contact_username,
+        type: :string,
+        description: "Instance owner username",
+        suggestions: ["admin"]
+      },
+      %{
         key: :limit,
         type: :integer,
         description: "Posts character limit (CW/Subject included in the counter)",