Merge branch 'localization-20131020'
Conflicts: core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/Running/status_de.properties core/src/main/resources/hudson/model/UpdateCenter/body_de.properties core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties core/src/main/resources/hudson/model/View/sidepanel_cs.properties Conflicts are resolved in favor of the master branch, assuming people editing the core is more trustworthy.
Loading
Please register or sign in to comment