Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'
authorlambda <lain@soykaf.club>
Fri, 24 May 2019 09:54:45 +0000 (09:54 +0000)
committerlambda <lain@soykaf.club>
Fri, 24 May 2019 09:54:45 +0000 (09:54 +0000)
commit6499adc6a83b4064f7283de3c729053e62ade7b2
tree94f316fd8392ef293037a102f5c2dc95fe504280
parent75e78d4e239a5c999306e92b181b0e29c52dc9db
parent356c047759735bcd984ebd44059a21a3cf22af0e
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'

explicitly set reverse proxy upstream to IPv4

Closes #930

See merge request pleroma/pleroma!1197