Merge branch 'incoming-id-fixes' into 'develop'
authorlain <lain@soykaf.club>
Sun, 13 Oct 2019 15:37:49 +0000 (15:37 +0000)
committerlain <lain@soykaf.club>
Sun, 13 Oct 2019 15:37:49 +0000 (15:37 +0000)
Assorted transmogrifier fixes

See merge request pleroma/pleroma!1831


Trivial merge