Skip to content
Commit fd6a2288 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

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.
parents 5e3387c6 bc711ee1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment