Skip to content
Commit 43960f10 authored by Baptiste Mathus's avatar Baptiste Mathus
Browse files

Merge branch 'master' into PR-2831-szpak

# Conflicts:
#	core/src/main/java/hudson/model/ViewGroupMixIn.java
#	test/src/test/java/hudson/model/ViewTest.java
parents f0f07949 108cf872
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