Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 14 Aug 2019 18:44:50 +0000 (21:44 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 14 Aug 2019 18:44:50 +0000 (21:44 +0300)
commit8778c16dac1789eeb6dd51524573163216200b5d
tree1f375b267c5c79b97eb2e12c2c343709705815ba
parenta180c1360ecdbed76eccf3435bb2c831356746bc
parent4a5b0965a0d07d45bfc4687c80c752ec824457cc
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
config/config.exs
docs/config.md
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
mix.exs
mix.lock
test/user_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs