Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 29 Nov 2019 07:17:59 +0000 (10:17 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 29 Nov 2019 07:17:59 +0000 (10:17 +0300)
commit52cc7de82cf3aa637d599edc357909be8c9366eb
tree3331c84530c0d93c41171f83c6270c8d499f5195
parentc8d3c3bfeca66d16846f97b50328e0718cfe5fef
parentd7b40dd4ba5bf3890be8a8b69d5aff84f5ffc5d2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts:
# mix.lock
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
mix.exs
mix.lock
test/user_test.exs
test/web/mastodon_api/views/account_view_test.exs
test/web/streamer/streamer_test.exs