Commit 78bf9e92 authored by dbeltran's avatar dbeltran
Browse files

Merge branch 'vdevel-3.13.0'

# Conflicts:
#	autosubmit/autosubmit.py
#	autosubmit/config/config_common.py
#	autosubmit/database/db_common.py
#	autosubmit/git/autosubmit_git.py
#	autosubmit/job/job.py
#	autosubmit/job/job_list.py
#	autosubmit/job/job_list_persistence.py
#	autosubmit/job/job_packages.py
#	autosubmit/monitor/diagram.py
#	autosubmit/notifications/mail_notifier.py
#	autosubmit/platforms/ecplatform.py
#	autosubmit/platforms/lsfplatform.py
#	autosubmit/platforms/paramiko_platform.py
#	autosubmit/platforms/pbsplatform.py
#	autosubmit/platforms/psplatform.py
#	autosubmit/platforms/sgeplatform.py
#	autosubmit/platforms/slurmplatform.py
#	bin/autosubmit
parents c92e8657 d7edb893
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