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 |
před 4 roky | |
---|---|---|
.. | ||
instance_test.exs | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue | před 4 roky |
instances_test.exs | added test helpers to clear config after tests | před 4 roky |