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)
commit2d0a2d94663bb38319c6d75d91836c32f9ac178e
tree27e53c2f0a652db51464c5c06c75641f30369a93
parent9998b4519da0a732d2a91ca067f4f849a0d37be6
parent5cb3d441bc3f5ac4b1e8cf5a8b4c7b44e14ef91f
Merge branch 'develop' into 'develop'

Apache config for everything on one host.

See merge request pleroma/pleroma!103