diff options
| author | lain <lain@soykaf.club> | 2019-02-01 10:21:17 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-02-01 10:21:17 +0100 |
| commit | 01d483f9c76456ed03010f5a0f5e08e118db27a8 (patch) | |
| tree | f3d0ca4e15c951d38e44e85befd366f1a8eca0f9 /config | |
| parent | b19b4f85376f6bad33bb37b1624f45dbd502bfda (diff) | |
| parent | b3b0855456a92351667a50c8ea77f328bded76ca (diff) | |
| download | pleroma-01d483f9c76456ed03010f5a0f5e08e118db27a8.tar.gz pleroma-01d483f9c76456ed03010f5a0f5e08e118db27a8.zip | |
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 98c94c149..d0d53a64a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -146,6 +146,7 @@ config :pleroma, :instance, banner_upload_limit: 4_000_000, registrations_open: true, federating: true, + federation_reachability_timeout_days: 7, allow_relay: true, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, |