Skip to content
Commit 3c2e8171 authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'security' into security-stable-1.596 

Conflicts:
	core/src/main/java/hudson/PluginManager.java
	core/src/test/java/hudson/PluginManagerTest.java
parents 9285ed86 a1875a15
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