Commit fab7459e 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/n/netcdf.py
	easybuild/easyblocks/n/netcdf_fortran.py
	easybuild/easyblocks/w/wrf.py
	easybuild/framework/application.py
parents 3b9f21b9 08b17152
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