diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-03-02 08:26:30 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-03-02 08:26:30 +0300 |
| commit | 882dd4684381a06395abd262363858011f06327d (patch) | |
| tree | 4cf2e15128d4a55ff248d47a2dfa702eafb90717 /config | |
| parent | 40d4362261abaf0856a1b4397a4bff6344137120 (diff) | |
| parent | 4cb166e979ea66a1c79995dacacbcf44fbf7365f (diff) | |
| download | pleroma-882dd4684381a06395abd262363858011f06327d.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 690c98e40..87396a88d 100644 --- a/config/test.exs +++ b/config/test.exs @@ -38,7 +38,7 @@ config :pleroma, :instance, external_user_synchronization: false, static_dir: "test/instance_static/" -config :pleroma, :activitypub, sign_object_fetches: false +config :pleroma, :activitypub, sign_object_fetches: false, follow_handshake_timeout: 0 # Configure your database config :pleroma, Pleroma.Repo, |