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

Merge branch 'slurm-2.5' 

Conflicts:
	META
	NEWS
	src/plugins/priority/multifactor2/priority_multifactor2.c
parents 5a92b177 fc3997f9
Expand all 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