Merge branch 'develop' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 3 Jun 2018 19:52:48 +0000 (19:52 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 3 Jun 2018 19:52:48 +0000 (19:52 +0000)
commit04c584391ccb726a2b4b08dfd82a1ee27f36d31b
tree1840e7542a514a8154ac3324c811af29d27cfb0c
parent8073af6e105ec583491191ded5f76a2700402224
parent13925e0eb3ec8fd85eb649414f2656333e27ec03
Merge branch 'develop' into 'develop'

Added: caddy webserver config example

Closes #192

See merge request pleroma/pleroma!189