Commit 2eb2559d authored by Domingo Manubens-Gil's avatar Domingo Manubens-Gil
Browse files

Merge branch 'develop-3.0.0' into develop

Conflicts:
	conf/archdef/archer.conf
	conf/archdef/common.conf
	conf/archdef/hector.conf
	conf/autosubmit.conf
	conf/expdef.conf
	src/autosubmit.py
	src/config_parser.py
	src/expid.py
	src/job/job_list.py
	src/job/wrap.py
	templates/VERSION
	templates/common/common.wrapper
parents 7d3e7f66 8d59091b
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