Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ...

# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs

2019-08-22 20:59:58 +03:00

..

instance_test.exs

[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

2019-08-22 20:59:58 +03:00

instances_test.exs

added test helpers to clear config after tests

2019-08-19 15:34:29 +00:00