From a1664352c87713d8f4d90e5b0f3af4ea59d3785c Mon Sep 17 00:00:00 2001
From: rdvelazquez <ryan.velazquez0001@temple.edu>
Date: Tue, 18 Jun 2019 14:04:28 -0400
Subject: [PATCH 1/2] add hyphy_json_results datatype

---
 config/datatypes_conf.xml.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample
index 7b84868bee1..03a29b00ad2 100644
--- a/config/datatypes_conf.xml.sample
+++ b/config/datatypes_conf.xml.sample
@@ -160,6 +160,7 @@
     <datatype extension="loom" type="galaxy.datatypes.binary:Loom" description="An HDF5-based Loom File" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="h5ad" type="galaxy.datatypes.binary:Anndata" description="An HDF5-based anndata File" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="mz5" type="galaxy.datatypes.binary:H5" subclass="true" mimetype="application/octet-stream" display_in_upload="true"/>
+    <datatype extension="hyphy_json_results" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="true" display_in_upload="false"/>
     <datatype extension="hivtrace" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="true" display_in_upload="false"/>
     <datatype extension="cool" type="galaxy.datatypes.binary:Cool" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="html" type="galaxy.datatypes.text:Html" mimetype="text/html"/>

From f920a20ce33516e26ff9eaa2d5e273053aa5c9f0 Mon Sep 17 00:00:00 2001
From: Ryan Velazquez <ryan.velazquez0001@temple.edu>
Date: Thu, 20 Jun 2019 09:28:39 -0400
Subject: [PATCH 2/2] Update config/datatypes_conf.xml.sample

Co-Authored-By: Marius van den Beek <m.vandenbeek@gmail.com>
---
 config/datatypes_conf.xml.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample
index 03a29b00ad2..f949e9605c0 100644
--- a/config/datatypes_conf.xml.sample
+++ b/config/datatypes_conf.xml.sample
@@ -160,7 +160,7 @@
     <datatype extension="loom" type="galaxy.datatypes.binary:Loom" description="An HDF5-based Loom File" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="h5ad" type="galaxy.datatypes.binary:Anndata" description="An HDF5-based anndata File" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="mz5" type="galaxy.datatypes.binary:H5" subclass="true" mimetype="application/octet-stream" display_in_upload="true"/>
-    <datatype extension="hyphy_json_results" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="true" display_in_upload="false"/>
+    <datatype extension="hyphy_results.json" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="true" display_in_upload="false"/>
     <datatype extension="hivtrace" type="galaxy.datatypes.text:Json" mimetype="application/json" subclass="true" display_in_upload="false"/>
     <datatype extension="cool" type="galaxy.datatypes.binary:Cool" mimetype="application/octet-stream" display_in_upload="true"/>
     <datatype extension="html" type="galaxy.datatypes.text:Html" mimetype="text/html"/>