Skip to content
Commit 211231d1 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merged 2dbe144b 

Conflicts:
	core/src/main/java/hudson/LocalPluginManager.java
parents 244ff567 2dbe144b
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