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

Merge branch 'feature/mrf-subchain' into 'develop'

Browse source 
MRF: subchain policy

See merge request pleroma/pleroma!1233
This commit is contained in:
kaniini 2019-06-04 05:49:54 +00:00
commit 9f0d0d0805
6 changed files with 95 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -326,6 +326,8 @@ config :pleroma, :mrf_keyword,
federated_timeline_removal: [],
replace: []
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,