Commit c3ecce95 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into regtest_bug_fixes

Conflicts:
	easybuild/build.py
parents 107a830c 65a82453
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