Skip to content
GitLab
Commit 29f175b7 authored by alejluther's avatar alejluther
Browse files

Merge branch 'master' of https://github.com/alejluther/slurm 

Conflicts:
	slurm/slurm.h.in
parents e29aa2fc 1e77b937
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