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

Merge remote-tracking branch 'security/security' into rc 

Conflicts:
	.idea/encodings.xml
	core/pom.xml
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
parents 481f28b7 be195b0e
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