Commit c9cbd091 authored by Toon Willems's avatar Toon Willems
Browse files

Merge branch 'develop' into 315-regtest-rework

Conflicts:
	easybuild/build.py
parents a9440b6a 13c1788e
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