Merge remote-tracking branch 'upstream/develop' into aliases
authorAlex Gleason <alex@alexgleason.me>
Fri, 7 Aug 2020 21:35:15 +0000 (16:35 -0500)
committerAlex Gleason <alex@alexgleason.me>
Fri, 7 Aug 2020 21:35:15 +0000 (16:35 -0500)
commit1a5a7ba6e8a936d3138ca530d3466111e542aef6
treec056138ee21661af45d2363ce01282aafffb3fc0
parentbd1e2e3a58ebd702306e7a6e2df985ac07e5f7d8
parent47698fc322da58894dd41c1bfd5ca0376200dc5e
Merge remote-tracking branch 'upstream/develop' into aliases
CHANGELOG.md
docs/API/pleroma_api.md
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/router.ex
test/user_test.exs
test/web/mastodon_api/views/account_view_test.exs