• bow's avatar
    Merge branch 'develop' into feature-gentrap · 14d8d45f
    bow authored
    Conflicts:
    	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsMpileup.scala
    	public/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
    14d8d45f