Skip to content
GitLab
Commit 5f00fdee authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into 236_DOLFIN 

Conflicts:
	easybuild/easyblocks/l/lapack.py
	easybuild/framework/application.py
	easybuild/tools/modules.py
parents 355a601a 84984956
Hide whitespace changes
Inline Side-by-side
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