projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into stable
[akkoma]
/
lib
/
pleroma
/
emoji
/
pack.ex
diff --git
a/lib/pleroma/emoji/pack.ex
b/lib/pleroma/emoji/pack.ex
index 09bfcc868006c8dc39b8fad10f0e2cf49fbf616f..8d233d5e4241dcacb045c2876e1c65f2d56fa12c 100644
(file)
--- a/
lib/pleroma/emoji/pack.ex
+++ b/
lib/pleroma/emoji/pack.ex
@@
-542,7
+542,7
@@
defmodule Pleroma.Emoji.Pack do
defp http_get(%URI{} = url), do: url |> to_string() |> http_get()
defp http_get(url) do
defp http_get(%URI{} = url), do: url |> to_string() |> http_get()
defp http_get(url) do
- with {:ok, %{body: body}} <- Pleroma.HTTP.get(url, [],
pool: :default
) do
+ with {:ok, %{body: body}} <- Pleroma.HTTP.get(url, [],
[]
) do
Jason.decode(body)
end
end
Jason.decode(body)
end
end