Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 21 Oct 2019 08:05:09 +0000 (11:05 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 21 Oct 2019 08:05:09 +0000 (11:05 +0300)
commita11a7176d59deafa08a865d6e0950b9b9c540f18
tree9a5004f4de7bfa4bf515adaddab65e290d8e38e7
parent75da202ab74489af15e086f06810e22211d52d33
parent2ebe8c416a72b512feaba87040982da5bcf865cf
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/views/user_view.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/views/user_view_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs