Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 28 Apr 2020 12:16:21 +0000 (14:16 +0200)
committerlain <lain@soykaf.club>
Tue, 28 Apr 2020 12:16:21 +0000 (14:16 +0200)
commitb5dc59c8fa587b4db844c7fc0ba16e5cb00bfd38
tree85fa5f1a8a1c87aaa4d6fc999995950c1da27d98
parentf8e56d4271f8c495316d304dd0de7f0a63eb0645
parent12bb7fc0dc94068d8337f10fc337ab23c8c7e77e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex