Commit 5aa86dd7 authored by Toon Willems's avatar Toon Willems
Browse files

Merge branch 'master' into 281-remove-build-dir

Conflicts:
	easybuild/easybuild_config.py
parents f25d835f c144acf9
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