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

Merge branch 'slurm-14.11' into slurm-15.08 

Conflicts:
	META
	NEWS
parents 8c3fcb09 a5f7dce8
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