diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-14 02:17:18 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-14 02:17:18 +0000 |
| commit | d6da4a75ce2f07ed07f2acc27f06cc367eea760f (patch) | |
| tree | c8534279ad7a442df42f4d1539f2bfb909cde520 /config/config.exs | |
| parent | 9c499435f046d58b4a56605c190a890b070f5315 (diff) | |
| parent | dcb4711e92382b88326260d7e1951eb66941ed1b (diff) | |
| download | pleroma-1.0.5.tar.gz | |
Merge branch 'release/1.0.5' into 'master'v1.0.5
1.0.5 release
See merge request pleroma/pleroma!1549
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 872ee3b00..7e901a1f5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -220,6 +220,7 @@ config :pleroma, :instance, }, registrations_open: true, federating: true, + federation_incoming_replies_max_depth: 100, federation_reachability_timeout_days: 7, federation_publisher_modules: [ Pleroma.Web.ActivityPub.Publisher, @@ -300,7 +301,6 @@ config :pleroma, :assets, default_mascot: :pleroma_fox_tan config :pleroma, :activitypub, - accept_blocks: true, unfollow_blocked: true, outgoing_blocks: true, follow_handshake_timeout: 500 @@ -334,6 +334,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: [], |