Merge branch 'correct-and-improve-http-options' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 6 Dec 2018 15:57:56 +0000 (15:57 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 6 Dec 2018 15:57:56 +0000 (15:57 +0000)
commitabead01ab6f5586e60d467d7efd0de560a97c5bd
tree8991de62733d2fed65ca271b420c5f35d2f7adcc
parentb0adea30b38713e70039475acdd3defbef57171a
parenta09ed0f5afe6336763b47edab0c0d9a629a74ad0
Merge branch 'correct-and-improve-http-options' into 'develop'

Correct and improve http options

See merge request pleroma/pleroma!505
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex