Merge branch 'fix/dm-timeline-activities' into 'develop'
authoreal <eal@waifu.club>
Wed, 30 May 2018 12:31:59 +0000 (12:31 +0000)
committereal <eal@waifu.club>
Wed, 30 May 2018 12:31:59 +0000 (12:31 +0000)
commit196d36a7d5e94ea2b494c5910a263da20c985e66
tree4259ecfcffc5c6e8c42adbe67eb3b9366bde095e
parent8bd7ace4203a06257eda19829a14e17e381724d9
parent7cb2e2971e8d348e9c808455e2e4c262e09da806
Merge branch 'fix/dm-timeline-activities' into 'develop'

MastoAPI: fix dm_timeline getting non-create activities.

See merge request pleroma/pleroma!182