diff options
author | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
commit | 9570a5be405c4cf4f07907eab4ced21e07fa20c9 (patch) | |
tree | 9575741206d0604e74ab2d8f719c3da0a3002b1d /test/reverse_proxy_test.exs | |
parent | 418ae6638d64c915ce4dae742dd493f43c8025d8 (diff) | |
parent | 16cfee708ec8e9c6cbbeb15432127c7757c5c173 (diff) | |
download | pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.tar.gz |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'test/reverse_proxy_test.exs')
-rw-r--r-- | test/reverse_proxy_test.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/reverse_proxy_test.exs b/test/reverse_proxy_test.exs index f542de97c..f4b7d6add 100644 --- a/test/reverse_proxy_test.exs +++ b/test/reverse_proxy_test.exs @@ -5,7 +5,6 @@ defmodule Pleroma.ReverseProxyTest do use Pleroma.Web.ConnCase, async: true import ExUnit.CaptureLog - import ExUnit.CaptureLog import Mox alias Pleroma.ReverseProxy alias Pleroma.ReverseProxy.ClientMock |