Merge the default options with custom ones in ReverseProxy and
authorrinpatch <rinpatch@sdf.org>
Fri, 12 Jul 2019 20:52:26 +0000 (23:52 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 12 Jul 2019 20:52:26 +0000 (23:52 +0300)
commitb001b8891a0ae9d8c7291f8148eb68a354cd319f
tree1a7d090f2ff5eaa09450531d5dd94730bd1516b4
parent5999780e8247b8f26b270ac3285f960057fbc9ea
Merge the default options with custom ones in ReverseProxy and
Pleroma.HTTP
lib/pleroma/http/connection.ex
lib/pleroma/http/http.ex
lib/pleroma/reverse_proxy/reverse_proxy.ex