Merge branch 'bugfix/corsplug-config' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 11 Nov 2018 05:49:49 +0000 (05:49 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 11 Nov 2018 05:49:49 +0000 (05:49 +0000)
commit617aff4f0c86de298439f64df43d7e95364530c0
treeb3ffa30245e839515c4b7c8b333ac69fa1ce60e2
parent61d173d37c840df4ddba1e328298bc64508880e0
parentfd918863aa842fda58c620434e3b1f15d510cb53
Merge branch 'bugfix/corsplug-config' into 'develop'

properly configure CORSPlug

See merge request pleroma/pleroma!440