Skip to content
Commit cd075243 authored by christ66's avatar christ66
Browse files

Merge remote-tracking branch 'upstream/master' into JENKINS-22811 

Conflicts:
	test/src/test/java/hudson/model/ItemGroupMixInTest.java
parents fa40c102 84575541
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