Skip to content
Commit 041f9b9f authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'security' into security-rc 

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
	test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
parents 678e8810 6e1defe5
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