Commit 11721e5d authored by bow's avatar bow
Browse files

Merge branch 'develop' into feature-gentrap_additions

Conflicts:
	public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/Gentrap.scala
parents d7fa4f90 9a37f7d6
Markdown is supported
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