Merge branch 'dev' into admin_grid_formbuilder

galaxyproject · Aug 30, 2017 · 9eabb2a · 9eabb2a
2 parents 792727b + bd13cad
commit 9eabb2a
Show file tree

Hide file tree

Showing 76 changed files with 895 additions and 2,436 deletions.
diff --git a/client/bower.json b/client/bower.json
@@ -17,7 +17,6 @@
     "d3": "~3",
     "farbtastic": "~2.0.0-alpha.1",
     "toastr": "~2.1.0",
-    "jQTouch": "git://github.com/senchalabs/jQTouch#~1.0.0",
     "bib2json": "git://github.com/galaxyproject/bib2json#galaxy",
     "jquery-form": "~3.46.0",
     "jquery-autocomplete": "git://github.com/dyve/jquery-autocomplete",