Commit ed5f7f2c authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge remote-tracking branch 'upstream/release_24.1' into 111-update-galaxy-24-1

# Conflicts:
#	client/src/components/History/Content/ContentItem.vue
#	client/src/components/History/Content/Dataset/DatasetActions.vue
#	client/src/components/JobInformation/JobInformation.vue
#	client/src/components/Login/LoginForm.vue
#	client/src/components/Login/LoginIndex.vue
#	client/src/components/User/ExternalIdentities/ExternalLogin.vue
#	client/src/components/providers/JobProvider.js
#	client/src/style/scss/base.scss
#	config/plugins/visualizations/editor/config/editor.xml
#	lib/galaxy/authnz/custos_authnz.py
#	lib/galaxy/authnz/managers.py
#	lib/galaxy/datatypes/protocols.py
#	lib/galaxy/dependencies/__init__.py
#	lib/galaxy/dependencies/pinned-requirements.txt
#	lib/galaxy/managers/hdas.py
#	lib/galaxy/managers/hdcas.py
#	lib/galaxy/managers/interactivetool.py
#	lib/galaxy/managers/jobs.py
#	lib/galaxy/model/__init__.py
#	lib/galaxy/objectstore/__init__.py
#	lib/galaxy/objectstore/rucio.py
#	lib/galaxy/objectstore/rucio_extra_clients.py
#	lib/galaxy/tool_util/data/__init__.py
parent 7112d9c4
Loading
Loading
Loading
Loading