Merge branch 'release_16.01' into release_16.04

Browse Source

Conflicts:
	client/galaxy/scripts/mvc/library/library-dataset-view.js
	static/maps/mvc/library/library-dataset-view.js.map
	static/maps/mvc/library/library-folder-view.js.map
	static/maps/mvc/library/library-library-view.js.map
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/library/library-dataset-view.js
	static/scripts/mvc/library/library-folder-view.js
	static/scripts/mvc/library/library-library-view.js

...

This commit is contained in:

Martin Cech

2016-04-19 11:02:44 -04:00

parent 00a55f8c02 e2f88296f8

commit 212f7f4aab

9 changed files with 21 additions and 33 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/mvc/library/library-dataset-view.js

+1 -1

File diff suppressed because one or more lines are too long

static/scripts/mvc/library/library-folder-view.js

+1 -1

File diff suppressed because one or more lines are too long

static/scripts/mvc/library/library-library-view.js

+1 -1

File diff suppressed because one or more lines are too long