Merge branch 'pr-upstream-http-proxy' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 30 Jan 2018 08:16:31 +0000 (08:16 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 30 Jan 2018 08:16:31 +0000 (08:16 +0000)
commit2f23ae5b684a363b6090a45c4b1b9685c9ed614a
treeab91ff8fbb1101d05378a5e0e3e6156dce9ae68c
parent189e9d63bc462fe5c0f97d70ffd4bac54aeeae05
parent066fe1a697286e38c9e9ef7f2c273c4e7a50ffdc
Merge branch 'pr-upstream-http-proxy' into 'develop'

Pr upstream http proxy

See merge request pleroma/pleroma!43