Merge branch 'revert-651f2695' into 'develop'
authorlain <lain@soykaf.club>
Wed, 1 Jul 2020 09:18:02 +0000 (09:18 +0000)
committerlain <lain@soykaf.club>
Wed, 1 Jul 2020 09:18:02 +0000 (09:18 +0000)
commitd889c9ca709a085031ab2b7ebfe4755c7471991d
tree996ab789fc0a56db23cc841fd081364989bbe33b
parent9cf4bfcd818b9631e4352cc30236ef541662c86b
parent691742e62d36831d31ba5623bb0fc5f91d77960a
Merge branch 'revert-651f2695' into 'develop'

Revert "Merge branch 'avatar-removing' into 'develop'"

See merge request pleroma/pleroma!2710