From: kaniini <nenolod@gmail.com>
Date: Tue, 6 Nov 2018 21:24:16 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e1c40b8ca288fe689cd78a96b34276089df3babe;p=akkoma

Merge branch 'patch-2' into 'develop'

Remove Access-Control-Allow-Origin in pleroma.nginx

See merge request pleroma/pleroma!424
---

e1c40b8ca288fe689cd78a96b34276089df3babe