Merge branch 'revert-a6d3bb5f' into 'develop'
authorlain <lain@soykaf.club>
Mon, 10 Aug 2020 13:59:38 +0000 (13:59 +0000)
committerlain <lain@soykaf.club>
Mon, 10 Aug 2020 13:59:38 +0000 (13:59 +0000)
commit93fbf399543fead24f8066d0cba33a0a51b89dd3
treec379401de63410564e8cf8e080551c3205c77ce2
parent353f3466d638efc012cdf5688d66edac20431da8
parent5c4548d5e74e40e18d8d1ed98ad256568a063370
Merge branch 'revert-a6d3bb5f' into 'develop'

Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868