Skip to content
GitLab
Commit c7f850f3 authored by dbeltran's avatar dbeltran
Browse files

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

# Conflicts:
#	autosubmit/job/job_common.py
#	autosubmit/job/job_list.py
parents dbe574c6 68a8da53
Hide whitespace changes
Inline Side-by-side
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