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

Merge branch 'slurm-2.5' 

Conflicts:
	doc/html/platforms.shtml
	doc/html/team.shtml
parents 300bf46d 5338879e
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