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)
commit8c2c325598dcd85f76752a17b39ce27689a65250
tree5283acd447e60c401631aab4b01768d3f79d142e
parent372614cfd3119b589c9c47619445714e8ae6c07e
parent6936854878860d1f6d04db1cd14a00208c6a5728
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/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