Merge branch 'revert-60cc7d6c' into 'develop'
authorlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:32:34 +0000 (16:32 +0000)
committerlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:32:34 +0000 (16:32 +0000)
commitc02e6ceea567b3ae7a5492ebd4d0babb798a13b4
treebdabe459c11fd9ef2f79402c6a454c3ca04fb341
parent3677a1e5785e8a753652debf37b2818e622f9ffd
parent4576520461e2e3a1c78133aaf31cb742a2a1a689
Merge branch 'revert-60cc7d6c' into 'develop'

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

See merge request pleroma/pleroma!2384