Skip to content
Commit 8aafca03 authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'security' into security-rc 

Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/security/ACL.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
parents 747238d8 c93635b9
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