projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/mediaproxy-s3' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
salmon
/
salmon.ex
diff --git
a/lib/pleroma/web/salmon/salmon.ex
b/lib/pleroma/web/salmon/salmon.ex
index fb08d645b6cf57d4e6dd9fa3602852ab0af7702c..a5a9e16c62cfd2f821234e960ce947f98d22ea19 100644
(file)
--- a/
lib/pleroma/web/salmon/salmon.ex
+++ b/
lib/pleroma/web/salmon/salmon.ex
@@
-7,7
+7,8
@@
defmodule Pleroma.Web.Salmon do
use Bitwise
- alias Pleroma.{Instances, User}
+ alias Pleroma.Instances
+ alias Pleroma.User
alias Pleroma.Web.XML
alias Pleroma.Web.OStatus.ActivityRepresenter