Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 05ed245353331489ee443ac483b1569dab38f500 https://github.com/galaxyproject/galaxy/commit/05ed245353331489ee443ac483b15... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-11-19 (Thu, 19 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/controllers/external_service.py M lib/galaxy/webapps/galaxy/controllers/forms.py M lib/galaxy/webapps/galaxy/controllers/request_type.py M lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/reports/controllers/jobs.py M lib/galaxy/webapps/reports/controllers/sample_tracking.py M lib/galaxy/webapps/reports/controllers/workflows.py M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/grids/repository_review_grids.py Log Message: ----------- Fix the bad merge :(