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

Merged commit 55d1f1fe 

Conflicts:
	core/src/main/resources/lib/form/optionalBlock.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
parents 427a8aba 55d1f1fe
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