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

Merge branch 'develop_stats' into develop_SAGA

Conflicts:
	VERSION
	autosubmit/autosubmit.py
	autosubmit/config/config_common.py
	autosubmit/job/job.py
	autosubmit/job/job_common.py
	autosubmit/job/job_list.py
	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
	setup.py
parents 61406df4 236bf243
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