Merge branch 'master' into 'oct_2020'

# Conflicts:
#   full_run_rand.yaml
#   full_run_seq.yaml
#   test.yaml
#   test_api/apitest/callbacks.py
#   test_api/apitest/runner.py
This commit is contained in:
Tim Bentley 2021-01-02 12:09:20 +00:00
commit 7d06a06f48

View File

@ -16,5 +16,10 @@ step4:
name: search_and_add name: search_and_add
payload: payload:
plugin: songs plugin: songs
step5:
delay: 1
name: search_and_add
payload:
plugin: bibles
step6: step6:
name: load_service_sequential name: load_service_sequential