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

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

Conflicts:
	autosubmit/monitor/monitor.py
parents 1e777d2a 48ccd41c
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