Skip to content
GitLab
Commit 4fd6fbbe authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.11' 

Conflicts:
	NEWS
	testsuite/expect/test20.12
parents 0c3bc00b f2dcf16c
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