projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve merge conflicts
[akkoma]
/
lib
/
pleroma
/
plugs
/
http_signature.ex
diff --git
a/lib/pleroma/plugs/http_signature.ex
b/lib/pleroma/plugs/http_signature.ex
index 21c1957135c0e5542847e7e2e4aa58682e5972b2..e2874c469191ff1f8af1582b45fb3a38ccd7ea42 100644
(file)
--- a/
lib/pleroma/plugs/http_signature.ex
+++ b/
lib/pleroma/plugs/http_signature.ex
@@
-4,7
+4,6
@@
defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
alias Pleroma.Web.ActivityPub.Utils
defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.HTTPSignatures
import Plug.Conn
require Logger
import Plug.Conn
require Logger