Commit af36db9e authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into contrib_latest_R_and_Chapel

Conflicts:
	easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb
parents 9568ad67 af852ad1
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