Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 9 Aug 2019 17:09:56 +0000 (20:09 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 9 Aug 2019 17:09:56 +0000 (20:09 +0300)
commit267262491ecf7b413052708062abac69b1d8f643
tree0d4d1f6c10766f49ad98e61fab36934b2e30706b
parentb7fad8d395c2bd1afe445a370e539571f5ec0c18
parent29807ef6a5b43a528ffca08b4f721b251f331c8d
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
config/config.exs
config/test.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/web/activity_pub/utils.ex
mix.exs
mix.lock
test/user_test.exs
test/web/activity_pub/activity_pub_controller_test.exs
test/web/federator_test.exs