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

Merge branch 'security' into security-rc 

Conflicts:
	test/src/test/java/hudson/model/UpdateCenter2Test.java
parents d2d91748 25411a0b
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