Merge branch 'develop' into refactor/discoverable_user_field
authorMark Felder <feld@FreeBSD.org>
Thu, 15 Oct 2020 21:39:01 +0000 (16:39 -0500)
committerMark Felder <feld@FreeBSD.org>
Thu, 15 Oct 2020 21:39:01 +0000 (16:39 -0500)
commitfb056ce05b43841ce57135ffb0b25845c41639ef
treeedd3e47128b454ab721027b5c6f30d0bcc5bd27c
parent724e4b7f00041667b9fa61fd1b7dd51c8eeaa102
parent5703fb6d2a5f9fcffe050eadbc43758bcd2efa14
Merge branch 'develop' into refactor/discoverable_user_field
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/pleroma/user_test.exs