Merge develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index a1cca06f868985cb1600332d1513626193794ad0..eeaaedf48d5cbd9540cf12b22ab9be2201231fa9 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: [],
@@ -467,6 +468,14 @@ config :pleroma, Pleroma.ScheduledActivity,
   total_user_limit: 300,
   enabled: true
 
+config :pleroma, :email_notifications,
+  digest: %{
+    active: true,
+    schedule: "0 0 * * 0",
+    interval: 7,
+    inactivity_threshold: 7
+  }
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"