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

Merge branch 'oss' 

Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/resources/lib/form/textbox.jelly
	core/src/main/resources/lib/form/withCustomDescriptorByName.jelly
	pom.xml
parents 23daeeec 2220b7f9
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