Skip to content
Blame
History
Permalink
  • Kohsuke Kawaguchi's avatar
    Merge branch 'localization-20131020' · fd6a2288
    Kohsuke Kawaguchi authored 
    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.
    fd6a2288
To find the state of this project's repository at the time of any of these versions, check out the tags.