Merge branch 'fix/mix-tasks' into 'develop'
authorlain <lain@soykaf.club>
Sun, 26 Jul 2020 11:47:18 +0000 (11:47 +0000)
committerlain <lain@soykaf.club>
Sun, 26 Jul 2020 11:47:18 +0000 (11:47 +0000)
commitce9647aed786368536057492604e8ec99cd7aee2
treece1650364b1711757c9636d45e605957642d9545
parent51627a10e5d815d7a5edc277c974d3bd463273be
parent65a1b048a8effa23eb99b1aeae3b97a7e7df3ef5
Merge branch 'fix/mix-tasks' into 'develop'

Fix/mix tasks

Closes #1972 and #1970

See merge request pleroma/pleroma!2795