Skip to content
Commit e612f416 authored by kzantow's avatar kzantow
Browse files

Merge remote-tracking branch 'primary/master' into 

JENKINS-34174-plugin-download-timeout

# Conflicts:
#	core/src/main/resources/jenkins/install/pluginSetupWizard.properties
parents 6974d2b7 5d90f816
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment