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

Merge branch 'PJM_SUPPORT' 

# Conflicts:
#	autosubmit/platforms/paramiko_platform.py
#	autosubmit/platforms/slurmplatform.py
parents fda0ccf7 2cb9eb1b
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