projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugfix/pinned-statuses' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index 1c31877688e5dfa3372629b2bd60d32e070d4042..699d80cd7a7d24f8f3782f2d81742276fc4eb4ac 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-8,7
+8,6
@@
defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
- pool: :default,
timeout: 10000,
recv_timeout: 20000,
follow_redirect: true