Skip to content
Commit ba04edcc authored by beta's avatar beta
Browse files

Merge branch 'master' of https://github.com/jenkinsci/jenkins 

Conflicts:
	core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
	core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
parents 85a35094 c98ca86b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment