Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
committerlain <lain@soykaf.club>
Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
commitaf6d01ec93a07cd896bc4f0a2c2cf437c6fd51fc
tree54e02858d0fa9ca905ffe5a057c9f0accbeae115
parentdbd07d29a358a446d87078d60b993a59b757ad1d
parent396bc69aeef951f163c0c20474ce4653df1dd667
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/views/account_view_test.exs