Commit 1453c790 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into 236_DOLFIN

Conflicts:
	easybuild/easyblocks/s/scalapack.py
parents 0d581a4c b950913e
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