Merge branch 'develop' into refactor/following-relationships
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 21 Oct 2019 07:19:15 +0000 (14:19 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 21 Oct 2019 07:19:15 +0000 (14:19 +0700)
commit4ea1a61b008c932bc83fcd6cd07bb7f4c251204a
treec763bd3a2a21ee3e40384ee323076bbb577b7ccb
parent8ad015ef64e0d2a4cd9f2979ff08d28be3a635e5
parent62e3d76a450c1b34ba8d0c88a184ec861ed90f29
Merge branch 'develop' into refactor/following-relationships
lib/mix/tasks/pleroma/database.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
test/support/factory.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/relay_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs