Merge branch 'features/download-mastofe-build' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index b11e4c680faf4d56d4a736c37eeeb36b921719f5..1a9738cff4676551ea2f72c7c8b50d562be37195 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -221,7 +221,8 @@ config :pleroma, :instance,
   allowed_post_formats: [
     "text/plain",
     "text/html",
-    "text/markdown"
+    "text/markdown",
+    "text/bbcode"
   ],
   mrf_transparency: true,
   autofollowed_nicknames: [],
@@ -326,7 +327,8 @@ config :pleroma, :media_proxy,
       follow_redirect: true,
       pool: :media
     ]
-  ]
+  ],
+  whitelist: []
 
 config :pleroma, :chat, enabled: true