Commit 05fdf368 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into wien2k_xcrysden

Conflicts:
	easybuild/build.py
parents 4c85f6b2 3a107f31
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