Martin Cech d28ea45556 Merge branch 'release_15.05' into dev ...

Conflicts:
	config/plugins/visualizations/common/templates/script_entry_point.mako

2015-05-07 13:09:24 -04:00

..

__init__.py

Testing: move managers, web/base, datatypes/dataproviders, and visualization 'unit'(?) tests to using common mock objects and loading system; cleanup

2015-04-16 10:25:34 -04:00

galaxy_mock.py

Merge remote-tracking branch 'upstream/release_15.05' into dev

2015-05-06 15:25:47 -04:00

tempfilecache.py

Testing: move managers, web/base, datatypes/dataproviders, and visualization 'unit'(?) tests to using common mock objects and loading system; cleanup

2015-04-16 10:25:34 -04:00

utility.py

Attempt to fix manager, viz, and web unit tests for Python 2.6...

2015-05-06 14:06:16 -04:00