Skip to content
Commit 21d13481 authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'security-stable-1.596' into security-stable-1.609 

Conflicts:
	core/src/main/java/hudson/model/ItemGroupMixIn.java
parents 3c816c4b ecf3b2d7
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