Merge branch 'patch-2' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 6 Nov 2018 21:24:16 +0000 (21:24 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 6 Nov 2018 21:24:16 +0000 (21:24 +0000)
commite1c40b8ca288fe689cd78a96b34276089df3babe
treec0df99ef402d2d2834767b15ea213a2ecfc9fe61
parenta68c18f0ad6befe432e961bd348744b305492524
parent3ea4f9ac8deea09711c80e3ef2cce8d02c64f2ee
Merge branch 'patch-2' into 'develop'

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

See merge request pleroma/pleroma!424
installation/pleroma.nginx