Merge branch 'task-204-on-options-request' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 20 Sep 2018 23:54:51 +0000 (23:54 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 20 Sep 2018 23:54:51 +0000 (23:54 +0000)
Return 204 response on options request

See merge request pleroma/pleroma!347

1  2 
lib/pleroma/web/router.ex

Simple merge