+53
−3
+21
−3
+28
−3
+18
−3
Loading
# Conflicts: # lib/galaxy/version.py # packages/app/HISTORY.rst # packages/app/setup.cfg # packages/auth/HISTORY.rst # packages/auth/setup.cfg # packages/config/HISTORY.rst # packages/config/setup.cfg # packages/data/HISTORY.rst # packages/data/setup.cfg # packages/files/HISTORY.rst # packages/files/setup.cfg # packages/job_execution/HISTORY.rst # packages/job_execution/setup.cfg # packages/job_metrics/HISTORY.rst # packages/job_metrics/setup.cfg # packages/navigation/HISTORY.rst # packages/navigation/setup.cfg # packages/objectstore/HISTORY.rst # packages/objectstore/setup.cfg # packages/schema/HISTORY.rst # packages/schema/setup.cfg # packages/selenium/HISTORY.rst # packages/selenium/setup.cfg # packages/test_api/HISTORY.rst # packages/test_api/setup.cfg # packages/test_base/HISTORY.rst # packages/test_base/setup.cfg # packages/test_driver/HISTORY.rst # packages/test_driver/setup.cfg # packages/tool_shed/HISTORY.rst # packages/tool_shed/setup.cfg # packages/tool_util/HISTORY.rst # packages/tool_util/setup.cfg # packages/tours/HISTORY.rst # packages/tours/setup.cfg # packages/util/HISTORY.rst # packages/util/setup.cfg # packages/web_apps/HISTORY.rst # packages/web_apps/setup.cfg # packages/web_framework/HISTORY.rst # packages/web_framework/setup.cfg # packages/web_stack/HISTORY.rst # packages/web_stack/setup.cfg