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

Merge branch 'slurm-2.4' 

Conflicts:
	doc/html/configurator.easy.html.in
	doc/html/configurator.html.in
parents fab5e529 4109bd6c
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