Merge branch 'revert-13a7105b' into 'develop'
authorlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)
committerlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)
commit3677a1e5785e8a753652debf37b2818e622f9ffd
treee4c307c37a7a12052b6b34d4fce6b5f2833012f7
parentbf3afbc1a109e5965b335b21d4e7c522ad7a571c
parent7c060432fcac294269742ac3f452beb3f9a2fdab
Merge branch 'revert-13a7105b' into 'develop'

Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383