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

Merge branch 'SECURITY-144' into SECURITY-144-rc 

Conflicts:
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/PluginManager.java
	core/src/main/java/hudson/PluginWrapper.java
parents ef2a90c3 38cb00b3
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