Skip to content
Commit d5d47eda authored by Daniel Beck's avatar Daniel Beck
Browse files

Merge branch 'master' of https://github.com/jenkinsci/jenkins into JENKINS-3539 

Conflicts:
	test/src/test/java/hudson/model/ParametersTest.java
parents 190f0b6f d6f758af
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