Commit bd639708 authored by Olof Svensson's avatar Olof Svensson
Browse files

Merge branch 'main' of gitlab.esrf.fr:workflow/ewoks/ewoksppf into main

# Conflicts:
#	ewoksppf/tests/test_ppf_actors/pythonActorAddA.py
#	ewoksppf/tests/test_ppf_actors/pythonActorAddB.py
#	ewoksppf/tests/test_ppf_workflow22.py
parents c46fba91 7ed13d08
Pipeline #63639 failed with stages
in 1 minute and 58 seconds