Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 28 Sep 2018 00:51:45 +0000 (00:51 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 28 Sep 2018 00:51:45 +0000 (00:51 +0000)
commitdbc9feecbf11b696e984b40cbdf9ccde69cf469c
tree637adeb044e1be51e8b7e0221600b9c39c018861
parentdb989d1fa4d83ba5d726807ff4707eb8cee5010d
parent707077edde1fd8b98d5a2e89f63a5f821e33bd0f
Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'

activitypub: don't fall back to OStatus fetching when MRF rejects an object

See merge request pleroma/pleroma!362