Skip to content
Commit 92b14119 authored by Jesse Glick's avatar Jesse Glick
Browse files

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

Conflicts:
	changelog.html
parents adec3bb0 dfa9c4f3
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