Merge remote-tracking branch 'origin/develop' into translate-posts

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-27 13:48:10 +02:00 · 2024-04-27 13:48:10 +02:00 · 3893311bd2
commit 3893311bd2
parent b53abd9d79 50af909c01
81 changed files with 1362 additions and 170 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -574,6 +574,12 @@ config :pleroma, :config_description, [
          "https://status.pleroma.example.org"
        ]
      },
+      %{
+        key: :contact_username,
+        type: :string,
+        description: "Instance owner username",
+        suggestions: ["admin"]
+      },
      %{
        key: :limit,
        type: :integer,