Merge branch 'feature/caddyfile' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 30 Jan 2018 08:14:07 +0000 (08:14 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 30 Jan 2018 08:14:07 +0000 (08:14 +0000)
commit189e9d63bc462fe5c0f97d70ffd4bac54aeeae05
tree2e03778a6dae9f700544579a96a4a84f5040ed7d
parentede4883ac93b1827c8fab125125bff94c1a855db
parent6678fe3217d82da7297215c4de369235e3d4d05d
Merge branch 'feature/caddyfile' into 'develop'

Add a Caddyfile.

See merge request pleroma/pleroma!50