Skip to content
Snippets Groups Projects
Commit 696dea98 authored by Loraine Gueguen's avatar Loraine Gueguen
Browse files

Merge branch 'dev' into workflow_v2 

# Conflicts:
#	gga_init.py
#	speciesData.py
#	templates/gspecies_compose.yml.j2
#	workflows_phaeoexplorer/Galaxy-Workflow-chado_load_tripal_synchronize_jbrowse_2org_v3.ga
parents 08074e9b 273fb7c9
No related branches found
No related tags found
2 merge requests!9Release 2.0 (merge dev to master),!5Workflow v2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 1117 deletions
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