Merge remote-tracking branch 'origin/develop' into shigusegubu
This commit is contained in:
commit
4e05e7a989
84 changed files with 965 additions and 320 deletions
|
|
@ -447,6 +447,11 @@ config :pleroma, :mrf_follow_bot, follower_nickname: nil
|
|||
|
||||
config :pleroma, :mrf_inline_quote, template: "<bdi>RT:</bdi> {url}"
|
||||
|
||||
config :pleroma, :mrf_remote_report,
|
||||
reject_all: false,
|
||||
reject_anonymous: true,
|
||||
reject_empty_message: true
|
||||
|
||||
config :pleroma, :mrf_force_mention,
|
||||
mention_parent: true,
|
||||
mention_quoted: true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue