merged back the RC branch
Conflicts: core/src/main/java/jenkins/model/Jenkins.java test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
Showing
想要评论请 注册 或 登录
Conflicts: core/src/main/java/jenkins/model/Jenkins.java test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java