Commit ff371f36 authored by Javier Vegas-Regidor's avatar Javier Vegas-Regidor
Browse files

Merge remote-tracking branch 'origin/develop_SAGA' into develop_SAGA

Conflicts:
	autosubmit/autosubmit.py
	autosubmit/config/config_common.py
	autosubmit/job/job.py
	autosubmit/job/job_common.py
	autosubmit/job/job_list.py
	setup.py
parents c5fc89d7 36ea9e9e
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