Commit 390e789e authored by Toon Willems's avatar Toon Willems
Browse files

Merge branch 'develop' into 315-regtest-rework

Conflicts:
	easybuild/easyblocks/c/cp2k.py
	easybuild/easyblocks/i/itac.py
	easybuild/easyblocks/l/libsmm.py
	easybuild/easyblocks/t/tarball.py
parents 38227738 85a59357
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