Commit 02d440e4 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' of github.com:hpcugent/easybuild into develop

Conflicts:
	easybuild/tools/toolkit.py
parents f977613a fbd06a33
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