Merge branch 'feature/mediaproxy-whitelist' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)
commit5b2791698c7e09da6a5481f7c024ea8622e9a3c1
treea2b5c9a0c322ee68c363ce6c8b78c64525a0987b
parent8c9227c1f1fa9c98069b549976be5b9c4ace076e
parent24c3e2db2c6846073df80c124633dc851c20c107
Merge branch 'feature/mediaproxy-whitelist' into 'develop'

Add mediaproxy whitelist capability

Closes #837

See merge request pleroma/pleroma!1095