diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-25 07:15:33 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-25 07:22:56 +0300 |
| commit | 10f452ad1feae9a882b6dc4cd35e09adb7e78208 (patch) | |
| tree | 62083f08fbe99cd38002d1f6896cd2fd79675320 /test/web/streamer | |
| parent | 28701c08ad9219219a32f31b2ed9dcb83f92cd59 (diff) | |
| parent | 035c2c1415ed46abb268cf85c141384416a799e2 (diff) | |
| download | pleroma-10f452ad1feae9a882b6dc4cd35e09adb7e78208.tar.gz pleroma-10f452ad1feae9a882b6dc4cd35e09adb7e78208.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/streamer')
| -rw-r--r-- | test/web/streamer/streamer_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/streamer/streamer_test.exs b/test/web/streamer/streamer_test.exs index 2a7550551..1cf20f1c2 100644 --- a/test/web/streamer/streamer_test.exs +++ b/test/web/streamer/streamer_test.exs @@ -20,7 +20,7 @@ defmodule Pleroma.Web.StreamerTest do @streamer_timeout 150 @streamer_start_wait 10 - clear_config_all([:instance, :skip_thread_containment]) + clear_config([:instance, :skip_thread_containment]) describe "user streams" do setup do |