Merge remote-tracking branch 'upstream/develop' into aliases
authorAlex Gleason <alex@alexgleason.me>
Wed, 30 Dec 2020 23:10:02 +0000 (17:10 -0600)
committerAlex Gleason <alex@alexgleason.me>
Wed, 30 Dec 2020 23:10:02 +0000 (17:10 -0600)
commitcbce88007672dc810cb345bb9872a009cbdc93d8
tree45be2517812f2a598d9b6133554038a87d4b9f46
parent83770b7b391fdf8bdc22f63047b1cf444a7b16ce
parent38924166eb3228deb71a2e23f1e8fd3255c6bd85
Merge remote-tracking branch 'upstream/develop' into aliases
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/user.ex
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/api_spec/schemas/account.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.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