diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-04 05:49:54 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-04 05:49:54 +0000 |
| commit | 9f0d0d0805d0417636c3cf7aaf14d15ad13d0148 (patch) | |
| tree | bf02fc7b03a8b0119c0ba51208462f39f071fd12 /config | |
| parent | 59f6e794e1cbc1e5e4d9fd9ff7df23186740f83a (diff) | |
| parent | 7758148990184ac25e097dc7358a918b89aa3ca9 (diff) | |
| download | pleroma-9f0d0d0805d0417636c3cf7aaf14d15ad13d0148.tar.gz pleroma-9f0d0d0805d0417636c3cf7aaf14d15ad13d0148.zip | |
Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy
See merge request pleroma/pleroma!1233
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 2c71f4a27..7d70c1a5e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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, |