Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Fri, 17 Apr 2020 13:51:24 +0000 (15:51 +0200)
committerlain <lain@soykaf.club>
Fri, 17 Apr 2020 13:51:24 +0000 (15:51 +0200)
1  2 
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/router.ex
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/account_view_test.exs

Simple merge