Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Mon, 30 Sep 2019 16:16:22 +0000 (16:16 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 30 Sep 2019 16:16:22 +0000 (16:16 +0000)
commit56c91d1323ac354c89aa9fa79df2be0999460e3c
tree72c9fa83f3ba8367a1e362d09c087b0b25a62f73
parent4f3b8d5399e2023d901412bc01ae04ee1334f499
parent96e1db1cf1c244ccdd0ec02516f4bb2cce49154a
Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'

Backport !1749 to 1.1

See merge request pleroma/pleroma!1751