Commit 4e2e27cb authored by Nathan S. Watson-Haigh's avatar Nathan S. Watson-Haigh
Browse files

Merge branch 'develop' into fastqc-0.11.4-foss-2015b

Conflicts:
	easybuild/easyconfigs/f/FastQC/FastQC-0.10.1-Java-1.7.0_80.eb
	easybuild/easyconfigs/f/fastqc/fastqc-0.11.2.eb
	easybuild/easyconfigs/f/fastqc/fastqc-0.11.3.eb
	easybuild/easyconfigs/t/Trim_Galore/Trim_Galore-0.3.7-goolf-1.4.10.eb
parents e235142f 57abf8cf
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