mirror of
https://git.pleroma.social/sjw/pleroma.git
synced 2025-01-14 08:20:32 +01:00
a11a7176d5
# Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex