Merge branch 'develop' into issue/1855
This commit is contained in:
commit
579763126f
42 changed files with 717 additions and 234 deletions
|
|
@ -371,6 +371,8 @@ config :pleroma, :mrf_keyword,
|
|||
|
||||
config :pleroma, :mrf_subchain, match_actor: %{}
|
||||
|
||||
config :pleroma, :mrf_activity_expiration, days: 365
|
||||
|
||||
config :pleroma, :mrf_vocabulary,
|
||||
accept: [],
|
||||
reject: []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue