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

Merge branch 'develop' into 236_DOLFIN 

Conflicts:
	easybuild/easyblocks/o/openfoam.py
	easybuild/tools/toolkit.py
parents 27495d54 41a32331
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