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

Merge branch 'security-stable-1.596' into security-stable-1.609 

Conflicts:
	cli/src/test/java/hudson/cli/ConnectionTest.java
	pom.xml
parents 1d32134b 6653b519
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