Skip to content
GitLab
Commit 62d71c4a authored by dbeltran's avatar dbeltran
Browse files

Merge branch 'master' of https://earth.bsc.es/gitlab/es/autosubmit 

 Conflicts:
	autosubmit/autosubmit.py
	test/unit/test_job_package.py
parents bc95aeab 98a2335a
Hide whitespace changes
Inline Side-by-side
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