From: rinpatch <rinpatch@sdf.org>
Date: Sun, 8 Mar 2020 13:42:15 +0000 (+0000)
Subject: Merge branch 'stable' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=663e46606711720bac7bce5e1c89fb0f11e77e50;hp=--cc;p=akkoma

Merge branch 'stable' into 'develop'

Sync develop with stable

Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606

See merge request pleroma/pleroma!2278
---

663e46606711720bac7bce5e1c89fb0f11e77e50