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

Merge branch 'slurm-2.6' 

Conflicts:
	doc/html/team.shtml
	doc/man/man1/scontrol.1
parents ca6d639b d6ae12ac
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