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

Merge branch 'develop' into bio-urls 

Conflicts:
	easybuild/easyconfigs/r/R/R-3.1.3-foss-2015a.eb
	easybuild/easyconfigs/r/R/R-3.1.3-intel-2015a.eb
parents 0c375816 78a2c85c
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