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

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

Conflicts:
	autosubmit/config/config_common.py
	autosubmit/config/files/jobs.conf
	autosubmit/platforms/ecplatform.py
	autosubmit/platforms/hpcplatform.py
	autosubmit/platforms/localplatform.py
	autosubmit/platforms/lsfplatform.py
	autosubmit/platforms/pbsplatform.py
	autosubmit/platforms/psplatform.py
	autosubmit/platforms/sgeplatform.py
	autosubmit/platforms/slurmplatform.py
parents 4614daac 4f2c14b6
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