Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 20 Apr 2020 10:37:17 +0000 (12:37 +0200)
committerlain <lain@soykaf.club>
Mon, 20 Apr 2020 10:37:17 +0000 (12:37 +0200)
commit139b9d1338618aa0107c188a9a5505c6615768be
tree2a46e24596a199473feed97b068c088edff848bd
parent970b74383b43aa9a54c3cf59012944355e3eafbc
parent918a8094fc175ed71ccb7305d606fb0b221163f6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/side_effects.ex
lib/pleroma/web/mastodon_api/views/notification_view.ex
test/web/activity_pub/side_effects_test.exs