Commit 9b1410ad authored by Manuel G. Marciani's avatar Manuel G. Marciani
Browse files

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

# Conflicts:
#	autosubmit/autosubmit.py
#	autosubmit/config/config_common.py
#	autosubmit/config/config_parser.py
#	autosubmit/database/db_common.py
#	autosubmit/git/autosubmit_git.py
#	autosubmit/helpers/utils.py
#	autosubmit/history/experiment_history.py
#	autosubmit/job/job.py
#	autosubmit/job/job_dict.py
#	autosubmit/job/job_list.py
#	autosubmit/job/job_packager.py
#	autosubmit/job/job_packages.py
#	autosubmit/monitor/diagram.py
#	autosubmit/monitor/monitor.py
#	autosubmit/notifications/mail_notifier.py
#	autosubmit/platforms/paramiko_platform.py
#	autosubmit/platforms/paramiko_submitter.py
#	autosubmit/platforms/pbsplatform.py
#	autosubmit/platforms/platform.py
#	autosubmit/platforms/slurmplatform.py
#	docs/source/installation/index.rst
#	docs/source/userguide/configure/develop_a_project.rst
#	environment.yml
#	requeriments.txt
#	setup.py
#	test/regression/tests_utils.py
#	test/unit/test_autosubmit_config.py
#	test/unit/test_dic_jobs.py
parents bc2037db bf288eaa
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