Merge branch 'feature/cross-origin' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 26 Jan 2018 23:30:11 +0000 (23:30 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 26 Jan 2018 23:30:11 +0000 (23:30 +0000)
Access-Control-Allow-Origin

See merge request pleroma/pleroma!52

1  2 
installation/pleroma.nginx

Simple merge