From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 9 Apr 2018 06:58:28 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2d0a2d94663bb38319c6d75d91836c32f9ac178e;p=akkoma

Merge branch 'develop' into 'develop'

Apache config for everything on one host.

See merge request pleroma/pleroma!103
---

2d0a2d94663bb38319c6d75d91836c32f9ac178e