hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

Browse source
This commit is contained in:
Egor Kislitsyn 2020-06-12 18:25:29 +04:00
commit 697cf92024
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
20 changed files with 344 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -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: []