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

Merge branch 'slurm-14.03' into slurm-14.11 

Conflicts:
	src/squeue/print.c
parents 9e1b2d9b 261580be
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung