Merge branch 'develop' into webhooks

2026-05-14 09:25:50 +00:00 · 2026-05-14 09:25:50 +00:00 · 83dcc4ae36
commit 83dcc4ae36
parent 133fc64472 093b156c65
59 changed files with 2245 additions and 148 deletions
--- a/test/mix/tasks/pleroma/config_test.exs
+++ b/test/mix/tasks/pleroma/config_test.exs
@ -144,7 +144,13 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
          quarantined_instances: [],
          managed_config: true,
          static_dir: "instance/static/",
-          allowed_post_formats: ["text/plain", "text/html", "text/markdown", "text/bbcode"],
+          allowed_post_formats: [
+            "text/plain",
+            "text/html",
+            "text/markdown",
+            "text/bbcode",
+            "text/x.misskeymarkdown"
+          ],
          autofollowed_nicknames: [],
          max_pinned_statuses: 1,
          attachment_links: false,