Merge branch 'fix/pleroma.nginx' into 'develop'
authoreal <eal@waifu.club>
Mon, 15 Jan 2018 17:26:41 +0000 (17:26 +0000)
committereal <eal@waifu.club>
Mon, 15 Jan 2018 17:26:41 +0000 (17:26 +0000)
commitdb5dfd1b3eaadb7ecc07cf496c97901f4c8bc7d4
tree246ac49cdbe0b455ade044b350e319bff0506174
parent5a6f54b336c8cca7f6514bb9ce7db5b6c97f296f
parentaceef36e5675253b32b0be4322b055e98a0154e7
Merge branch 'fix/pleroma.nginx' into 'develop'

Correct pleroma.nginx

See merge request pleroma/pleroma!46