mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
Conflicts: changelog.html cli/pom.xml core/pom.xml core/src/main/java/hudson/ProxyConfiguration.java core/src/main/java/jenkins/model/Jenkins.java core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java core/src/main/resources/hudson/model/Messages_da.properties pom.xml test/pom.xml war/pom.xml