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

Merge branch 'security' into SECURITY-144 

Conflicts:
	core/src/main/java/hudson/slaves/Channels.java
	pom.xml
parents 547cc241 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