Skip to content
Commit 706676b4 authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'master' into BuildStep-Job

Conflicts:
	core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
parents a1188479 0449883d
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