diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-03 00:11:38 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-03 00:11:38 -0600 |
| commit | 8286ceb46522069607cc0a0dec864022606bf19d (patch) | |
| tree | 5270f50d3b6b00d3d2796d2e611a2606ffeb4ff1 /config/config.exs | |
| parent | 5da4f33bf136970706ddcf19bd701288acb141cf (diff) | |
| parent | 235c4139d701f7d25dac2a152d8ab6e4afb1c20d (diff) | |
| download | pleroma-8286ceb46522069607cc0a0dec864022606bf19d.tar.gz pleroma-8286ceb46522069607cc0a0dec864022606bf19d.zip | |
Merge remote-tracking branch 'origin/develop' into password-reset
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index b50c910b1..681b49827 100644 --- a/config/config.exs +++ b/config/config.exs @@ -321,9 +321,6 @@ config :pleroma, :frontend_configurations, subjectLineBehavior: "email", theme: "pleroma-dark", webPushNotifications: false - }, - masto_fe: %{ - showInstanceSpecificPanel: true } config :pleroma, :assets, @@ -352,6 +349,7 @@ config :pleroma, :manifest, config :pleroma, :activitypub, unfollow_blocked: true, outgoing_blocks: true, + blockers_visible: true, follow_handshake_timeout: 500, note_replies_output_limit: 5, sign_object_fetches: true, @@ -560,6 +558,7 @@ config :pleroma, Oban, mailer: 10, transmogrifier: 20, scheduled_activities: 10, + poll_notifications: 10, background: 5, remote_fetcher: 2, attachments_cleanup: 1, |