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

Merge branch 'develop' into 236_DOLFIN 

Conflicts:
	easybuild/easyblocks/i/imkl.py
	easybuild/tools/toolkit.py
parents e6bd38bb 642ebb78
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