Commit adb11c36 authored by dbeltran's avatar dbeltran
Browse files

Merge branch '4.0-branch-2022' of https://earth.bsc.es/gitlab/es/autosubmit into 4.0-branch-2022

 Conflicts:
	autosubmit/autosubmit.py
	autosubmit/config/config_common.py
	autosubmit/job/job.py
	autosubmit/job/job_list.py
parents c852d7d4 82e19ec7
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment