Skip to content
GitLab
Commit 3e1976dd authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-16.05' 

Conflicts:
	src/api/step_launch.c
parents 91ea68ad 1ec2a4ae
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