Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 4 Dec 2019 15:56:31 +0000 (18:56 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 4 Dec 2019 15:56:31 +0000 (18:56 +0300)
commit30caf3e51e32830153e693727b3765e8817171a3
treeb752dd12604afa8be2bc7c753a64a5725bc2ebbc
parent52cc7de82cf3aa637d599edc357909be8c9366eb
parent228bf4d214abe3bb62c52128d3bc145e396b174d
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts:
# lib/pleroma/user.ex
13 files changed:
CHANGELOG.md
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
mix.lock
test/notification_test.exs
test/support/factory.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/mastodon_api/views/account_view_test.exs