projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 8e3d7822430f67da0ecf64296b04449cbce34a43..dc9ae59aeb9e9eb1c8a9502973bfb364ca164830 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-412,6
+412,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: [],