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

Merge branch 'slurm-2.6' 

Conflicts:
	configure
	doc/man/man1/sh5util.1
parents 0ec6ab88 07a5f8ec
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