Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 12 May 2020 11:13:43 +0000 (13:13 +0200)
committerlain <lain@soykaf.club>
Tue, 12 May 2020 11:13:43 +0000 (13:13 +0200)
commitdcb5cda324c5a8233c100e49d0ad137a5daffd71
tree507d92da49d4dac465b136a7e26dd8237664019d
parentb5aa204eb8bf3f737d3d807a9924c0153d1b6d3e
parentf8190aea5e68a6e17ccc88b13486bd69c3b08450
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/views/account_view_test.exs