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

Merge branch 'slurm-15.08' 

Conflicts:
	testsuite/expect/Makefile.am
	testsuite/expect/Makefile.in
	testsuite/expect/README
parents 82782b76 90a18aaf
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