Merge remote-tracking branch 'upstream/develop' into aliases
authorAlex Gleason <alex@alexgleason.me>
Thu, 8 Oct 2020 20:44:48 +0000 (15:44 -0500)
committerAlex Gleason <alex@alexgleason.me>
Thu, 8 Oct 2020 20:44:48 +0000 (15:44 -0500)
commit77b1ea68a7700ac4a78c7f2e0ea9f118441d23da
tree06243af101a609256b517f48175380a7c4f5bfbb
parent4af1b803811cbb59d41f0149706d6dda340b4755
parent74be4de3f6c2c34447029649526637411acfa9f3
Merge remote-tracking branch 'upstream/develop' into aliases
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/web_finger/web_finger.ex
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
test/web/mastodon_api/views/account_view_test.exs