Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Sun, 17 May 2020 10:14:49 +0000 (12:14 +0200)
committerlain <lain@soykaf.club>
Sun, 17 May 2020 10:14:49 +0000 (12:14 +0200)
commit9c171097653abce49b9847fff66bc39b35719a1c
treee89ab9245f0844bfb3334f62f67f8ab9f0949580
parentf012c3a202ef43d1a8a1dc88f08057b7a41d3d78
parentb0ccdb5af4baa119b336298d38f34746cdce0111
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/mastodon_api/views/notification_view.ex
lib/pleroma/web/router.ex
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/account_view_test.exs
test/web/mastodon_api/views/notification_view_test.exs