Merge branch 'develop' into issue/1790-updated-oban
authorMark Felder <feld@FreeBSD.org>
Fri, 3 Jul 2020 15:36:41 +0000 (10:36 -0500)
committerMark Felder <feld@FreeBSD.org>
Fri, 3 Jul 2020 15:36:41 +0000 (10:36 -0500)
1  2 
config/config.exs
config/description.exs
mix.exs
mix.lock
test/web/activity_pub/activity_pub_test.exs
test/workers/cron/purge_expired_activities_worker_test.exs

Simple merge
Simple merge
diff --cc mix.exs
Simple merge
diff --cc mix.lock
Simple merge