Skip to content
Commit 9e68fed9 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

merged back the RC branch 

Conflicts:
	core/src/main/java/jenkins/model/Jenkins.java
	test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
parents f3a2ae31 17d15281
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