From: sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Mon, 30 Aug 2021 21:04:42 +0000 (+0100)
Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=b202cf15d6911e61045fccc4d793bddc4560ba68;hp=-c;p=akkoma

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
---

b202cf15d6911e61045fccc4d793bddc4560ba68
diff --combined config/config.exs
index 26f039c5e,828fe0085..ccfba065e
--- a/config/config.exs
+++ b/config/config.exs
@@@ -221,9 -221,6 +221,9 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  mrf_transparency: true,
 +  mrf_transparency_exclusions: [],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    autofollowing_nicknames: [],
    max_pinned_statuses: 1,
@@@ -563,6 -560,7 +563,7 @@@ config :pleroma, Oban
      mailer: 10,
      transmogrifier: 20,
      scheduled_activities: 10,
+     poll_notifications: 10,
      background: 5,
      remote_fetcher: 2,
      attachments_cleanup: 1,