projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma]
/
test
/
web
/
media_proxy
/
media_proxy_controller_test.exs
diff --git
a/test/web/media_proxy/media_proxy_controller_test.exs
b/test/web/media_proxy/media_proxy_controller_test.exs
index 0cda1e0b089cf63c750462e48855e2f9d2ce1df6..0dd2fd10c4678a95133ebc98ec30124808c9d387 100644
(file)
--- a/
test/web/media_proxy/media_proxy_controller_test.exs
+++ b/
test/web/media_proxy/media_proxy_controller_test.exs
@@
-8,7
+8,6
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
import Mock
alias Pleroma.Web.MediaProxy
- alias Pleroma.Web.MediaProxy.MediaProxyController
alias Plug.Conn
setup do