diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-08-13 22:51:15 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-08-13 22:51:15 +0000 |
| commit | 9ef31767f23b908f276c6cbd44b0bd46373f91fe (patch) | |
| tree | 0f71f35b9417f6ec9391ea46d1c5c5e72e53ca6e /config | |
| parent | c3a54cc34daa971153508f269b3e701ca6eb08cd (diff) | |
| parent | 5983f98f2618d5e744337f1f79b78c3ad2774d9c (diff) | |
| download | pleroma-9ef31767f23b908f276c6cbd44b0bd46373f91fe.tar.gz pleroma-9ef31767f23b908f276c6cbd44b0bd46373f91fe.zip | |
Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary
See merge request pleroma/pleroma!1559
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index b7047a039..758661120 100644 --- 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: [], |