Merge remote-tracking branch 'upstream/develop' into aliases
authorAlex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 17:33:24 +0000 (12:33 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 17:33:24 +0000 (12:33 -0500)
commit83770b7b391fdf8bdc22f63047b1cf444a7b16ce
treebba3b4d867ee5cdc07165784868c28f174c10317
parent7d8f610720abdadeff9238aa8a345a91e473e0fa
parent20137056900f97af34f4433858cbdf69be6c9840
Merge remote-tracking branch 'upstream/develop' into aliases
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/pleroma/web/mastodon_api/update_credentials_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs