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

Merge branch 'master' into DownloadSettings-JENKINS-19081 

Conflicts:
	core/src/main/java/hudson/model/DownloadService.java
	core/src/main/java/hudson/model/UpdateSite.java
parents 54c85007 a0d6e528
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