Merge branch 'stable-sync/2.1.1' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 17:57:02 +0000 (17:57 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 17:57:02 +0000 (17:57 +0000)
commit7c055af567e08be7f171a2fb687926bef5920899
tree46f61ff85c2fcacb5331e18984732b5ef696b124
parent0d2814ec8e41942cd5b056d9c1ed902be1e1773c
parent5ef840ed9ce277ebaf6367f2529cc686b8d6404b
Merge branch 'stable-sync/2.1.1' into 'develop'

Sync stable with develop after 2.1.1

Closes #2, #2047, #2095, #2116, #1987, and #2080

See merge request pleroma/pleroma!2974