Skip to content
Commit 507d3a9f authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'master' into DownloadSettings-JENKINS-19081 

Conflicts:
	test/src/test/resources/hudson/model/update-center.json.html
parents 1c99cc1a 21016fcb
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