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

Merge remote-tracking branch 'origin/master' into symbol 

Conflicts:
	core/src/main/java/hudson/model/FreeStyleProject.java
	core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
parents 53be006b 67597a7c
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