Skip to content
Snippets Groups Projects
Commit 169cfd68 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.5'

Conflicts:
	doc/man/man1/sbatch.1
parents 13cd951c 7223d0d2
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment