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)
Remove Access-Control-Allow-Origin in pleroma.nginx

See merge request pleroma/pleroma!424

1  2 
installation/pleroma.nginx

Simple merge