Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 21 Nov 2019 13:47:52 +0000 (16:47 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 21 Nov 2019 13:47:52 +0000 (16:47 +0300)
commitcad9b325e567c9c607c2b1d33c915cc88da716b1
treeed186327c32440517857aba719cba3b059031856
parent81f1c6bc4725f6d97d42ff89f24328ae5b505a2d
parent8feb5dcb4240e92bf20cdc6896877cfa9551b61c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
lib/pleroma/user.ex
lib/pleroma/user/search.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
mix.exs
test/user_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs