Merge branch 'develop' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 9 Apr 2018 06:58:28 +0000 (06:58 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 9 Apr 2018 06:58:28 +0000 (06:58 +0000)
Apache config for everything on one host.

See merge request pleroma/pleroma!103


Trivial merge