Jesse Glick d671beffe6 Merge branch 'security' into security-stable-1.596 ...

Conflicts:
	core/pom.xml
	core/src/main/java/hudson/model/DownloadService.java
	core/src/main/java/hudson/model/UpdateSite.java
	core/src/main/java/jenkins/model/DownloadSettings.java
	core/src/main/java/jenkins/util/JSONSignatureValidator.java
	core/src/main/resources/hudson/model/UpdateCenter/PageDecoratorImpl/footer.jelly
	core/src/main/resources/jenkins/model/DownloadSettings/config.groovy
	core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
	test/src/test/java/hudson/model/DownloadServiceTest.java

2015-01-28 09:04:06 -05:00

..

src

Merge branch 'security' into security-stable-1.596

2015-01-28 09:04:06 -05:00

move-l10n.groovy

Ability to remove keys as well as move them.

2014-07-31 17:18:34 -04:00

pom.xml

Towards 1.596.1

2015-01-28 13:53:18 +01:00

report-l10n.rb

…