Commit 5b49aabb authored by Your New SJW Waifu's avatar Your New SJW Waifu 💬

Merge branch 'neckbeard' of git.pleroma.social:sjw/pleroma into neckbeard

parents 59a92c4c 77a8595a
Pipeline #34075 failed with stages
in 16 minutes