Skip to content
Commit 7f51765a authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'security' into security-rc 

Conflicts:
	test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
parents 35b97d45 be06d6c4
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