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

Merge branch 'master' into DownloadSettings-JENKINS-19081 

Conflicts:
	test/src/test/java/hudson/model/UpdateSiteTest.java
parents d6b37a94 334ce1be
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