Merge remote-tracking branch 'upstream/develop' into aliases
authorAlex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:25:18 +0000 (19:25 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:25:18 +0000 (19:25 -0500)
commit7d8f610720abdadeff9238aa8a345a91e473e0fa
treec8fa941b0e0c0c7dd84888c4ae61e030f728b504
parent5ec7d88b77360ed78f75be6b1f94895c3f602972
parent481906207e6d803e5c4d3e455c7b93119e392177
Merge remote-tracking branch 'upstream/develop' into aliases
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/web_finger.ex
test/pleroma/web/mastodon_api/update_credentials_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs
test/pleroma/web/web_finger/web_finger_controller_test.exs