diff options
| author | feld <feld@feld.me> | 2021-03-30 16:59:34 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-03-30 16:59:34 +0000 |
| commit | 4c16f5d2ca5f7665b88b7b332b718f9445d9bb04 (patch) | |
| tree | 3fe60475ea36fd7c0fde80ace676a92d0a431b34 /config/config.exs | |
| parent | caadde3b04cf4c6509cc0841a338503e646221a0 (diff) | |
| parent | 16a7ffb1ea9dc8e2c7a70d9243424b40d594bd63 (diff) | |
| download | pleroma-4c16f5d2ca5f7665b88b7b332b718f9445d9bb04.tar.gz pleroma-4c16f5d2ca5f7665b88b7b332b718f9445d9bb04.zip | |
Merge branch 'upstream/mrf-followbot' into 'develop'
Upstream/mrf followbot
See merge request pleroma/pleroma!3060
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 8d1e17b42..4381068ac 100644 --- a/config/config.exs +++ b/config/config.exs @@ -409,6 +409,8 @@ config :pleroma, :mrf_object_age, threshold: 604_800, actions: [:delist, :strip_followers] +config :pleroma, :mrf_follow_bot, follower_nickname: nil + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], |