Skip to content
Commit 5abc651c authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merge branch 'groovy-view' 

Conflicts:
	core/src/main/java/hudson/ExtensionComponent.java
	core/src/main/resources/hudson/PluginManager/sidepanel.jelly
parents 5ea48db3 77290b9c
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