Skip to content
Commit 523aa087 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merge remote-tracking branch 'origin/2.0' into JENKINS-33662 

Conflicts:
	core/src/main/java/jenkins/install/SetupWizard.java
parents e7f72f01 c4fb6083
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