Skip to content

Commit

Permalink
Merge branch 'release_18.05' into release_18.09
Browse files Browse the repository at this point in the history
  • Loading branch information
nsoranzo committed Nov 2, 2018
2 parents 30aaa29 + 6da5157 commit 357e2f3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion config/datatypes_conf.xml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
<datatype extension="xmfa" type="galaxy.datatypes.msa:MauveXmfa" display_in_upload="true"/>
<datatype extension="cel" type="galaxy.datatypes.binary:Cel" display_in_upload="true"/>
<datatype extension="rdata" type="galaxy.datatypes.binary:RData" display_in_upload="true" description="Stored data from an R session"/>
<datatype extension="rdata.sce" type="galaxy.datatypes.binary:RData" description="Stored RDS from a SingleCellObject" subclass="true" />
<datatype extension="rdata.sce" type="galaxy.datatypes.binary:RData" description="Stored RDS from a SingleCellObject" subclass="true" display_in_upload="true"/>
<datatype extension="oxlicg" type="galaxy.datatypes.binary:OxliCountGraph" mimetype="application/octet-stream" display_in_upload="true"/>
<datatype extension="oxling" type="galaxy.datatypes.binary:OxliNodeGraph" mimetype="application/octet-stream" display_in_upload="true"/>
<datatype extension="oxlits" type="galaxy.datatypes.binary:OxliTagSet" mimetype="application/octet-stream" display_in_upload="true"/>
Expand Down

0 comments on commit 357e2f3

Please sign in to comment.