Merge branch 'feature/reverse-proxy' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 30 Nov 2018 18:15:44 +0000 (18:15 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 30 Nov 2018 18:15:44 +0000 (18:15 +0000)
reverse proxy / uploads

See merge request pleroma/pleroma!470

1  2 
lib/pleroma/application.ex

Simple merge