Merge branch 'stable-sync/2.1.2' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:42:42 +0000 (19:42 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:42:42 +0000 (19:42 +0000)
commit49584a9928f02b461a0356332440084473ea6b69
tree2ef89cabb0633d401915d6fbaad128647d168a2c
parent7bf269fe836ded974d2187c6b36eba4ab185ff25
parent065a4dddfdeb9a1b56318b6f0de1986e95a20734
Merge branch 'stable-sync/2.1.2' into 'develop'

Sync develop with 2.1.2

Closes #2133, #2131, and #2130

See merge request pleroma/pleroma!3007