Commit 33e840b3 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into 318-change-toolkit

Conflicts:
	easybuild/build.py
	easybuild/easyblocks/w/wrf.py
	easybuild/framework/application.py
	easybuild/framework/easyconfig.py
parents 587cdbec ce637b2b
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