Merge branch 'improve-example-caddyfile' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 20:16:46 +0000 (20:16 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 20:16:46 +0000 (20:16 +0000)
commit7faed99450221bab4d34f4853f877c6011d6bf21
treefc2f64aa8138242644343d2f8a56990abe3c639f
parentd802903c15f52e548ce070f30c7be3e79e748558
parentbff5ed154f4db9e7248535e664203a783711a700
Merge branch 'improve-example-caddyfile' into 'develop'

Improve example Caddyfile

See merge request pleroma/pleroma!296