guerler 32e027d431 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter ...

Conflicts:
	static/maps/mvc/form/form-section.js.map
	static/scripts/mvc/form/form-section.js

2015-05-13 04:19:08 -04:00

..

blue

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

2015-05-13 04:19:08 -04:00

shared_images

style: convert all sprite generation to use spritesmith, everything is now in less and built by grunt

2013-08-31 18:51:22 -04:00