Merge branch 'add-apache-cache-config' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 23 Feb 2019 04:01:21 +0000 (04:01 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 23 Feb 2019 04:01:21 +0000 (04:01 +0000)
commit7daa9a8c42272e0f1fd0ac3af31e0cf131d86219
tree0e849d1d3a60232c67630dc48d74cdd0bc0a6846
parent101c20f8d95299767c19498d627ff404f0a7b130
parentc75e643a72a3b27340877f21d7d9fe31dbfd146e
Merge branch 'add-apache-cache-config' into 'develop'

apache config: add instructions for mediaproxy.

See merge request pleroma/pleroma!856