Merge branch 'develop' into refactor/discoverable_user_field
authorMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 14:54:11 +0000 (09:54 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 14:54:11 +0000 (09:54 -0500)
1  2 
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/metadata/providers/restrict_indexing.ex
test/pleroma/user_search_test.exs
test/pleroma/user_test.exs
test/pleroma/web/admin_api/search_test.exs
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
test/pleroma/web/mastodon_api/update_credentials_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs
test/pleroma/web/metadata/providers/restrict_indexing_test.exs
test/pleroma/web/metadata_test.exs

Simple merge
Simple merge
Simple merge