Skip to content
Snippets Groups Projects
Commit b8e9adf3 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-15.08' 

Conflicts:
	NEWS
parents b8d48c44 4291ac95
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 2 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