Merge branch 'stable' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sun, 8 Mar 2020 13:42:15 +0000 (13:42 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 8 Mar 2020 13:42:15 +0000 (13:42 +0000)
commit663e46606711720bac7bce5e1c89fb0f11e77e50
tree2e1a0068583ca62870a15590c4ccba237999f51a
parent6d797b99282ff1067c6af04b3e1775ff2281333b
parente8493431bfc16977e43715bf8bdb09ac46580028
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