Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 27 Apr 2020 10:07:08 +0000 (12:07 +0200)
committerlain <lain@soykaf.club>
Mon, 27 Apr 2020 10:07:08 +0000 (12:07 +0200)
1  2 
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/common_api/common_api_test.exs