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

MRF Vocabulary See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00 · 2019-08-13 22:51:15 +00:00 · 9ef31767f2
commit 9ef31767f2
parent c3a54cc34d 5983f98f26
5 changed files with 169 additions and 0 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -338,6 +338,10 @@ config :pleroma, :mrf_keyword,

 config :pleroma, :mrf_subchain, match_actor: %{}

+config :pleroma, :mrf_vocabulary,
+  accept: [],
+  reject: []
+
 config :pleroma, :rich_media,
  enabled: true,
  ignore_hosts: [],