Merge branch 'develop' into gun
authorMark Felder <feld@FreeBSD.org>
Tue, 3 Mar 2020 23:15:49 +0000 (17:15 -0600)
committerMark Felder <feld@FreeBSD.org>
Tue, 3 Mar 2020 23:15:49 +0000 (17:15 -0600)
commit4427161ca3798aeee0290f0ed7ac5536039509d8
treeed45b8f7e551accff90eec1fb86d15fcecaea6b8
parent884d9710b209cc9981c7de61d4e95fd26cd83820
parent5992c256ad7c5bc8207240c9d51e03964e50eb64
Merge branch 'develop' into gun
lib/mix/tasks/pleroma/benchmark.ex
lib/pleroma/http/connection.ex
lib/pleroma/http/http.ex
lib/pleroma/http/request_builder.ex
lib/pleroma/reverse_proxy/client.ex
lib/pleroma/reverse_proxy/reverse_proxy.ex
lib/pleroma/web/web_finger/web_finger.ex
test/http_test.exs
test/reverse_proxy/reverse_proxy_test.exs
test/user_invite_token_test.exs