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

diff --combined config/config.exs
index 26f039c5e5661e6b8a911640d06ff468fc6efc39,828fe00857518594c69495ae44f705c9debd8b71..ccfba065ea37415a36c46dde047da36cb8735e90
--- 1/config/config.exs
--- 2/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,