Merge branch 'dev' of https://github.com/galaxyproject/galaxy into tool_form_section_tag

Browse Source

Conflicts:
	lib/galaxy/tools/__init__.py

...

This commit is contained in:

guerler

2015-04-06 12:30:17 -04:00

parent 5aa73d0e05 291cde77c5

commit 388587de1c

41 changed files with 505 additions and 2103 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

static/scripts/libs/lunr.js

-2

File diff suppressed because one or more lines are too long

static/scripts/mvc/tools.js

+1 -1

File diff suppressed because one or more lines are too long

static/scripts/viz/circster.js

+1 -1

File diff suppressed because one or more lines are too long