Skip to content
GitLab
Commit c061cd3e authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-16.05' 

Conflicts:
	src/common/slurmdb_pack.c
parents 98a87a82 17a9d97e
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