Skip to content
Commit 6206be1a authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'master' into SCM-Job 

Conflicts:
	core/src/main/java/hudson/model/CauseAction.java
	core/src/main/java/hudson/triggers/SCMTrigger.java
parents 7672f00b c826a014
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