Merge remote-tracking branch 'origin/master' · fabric8io/fabric8-jenkins-workflow-steps@c2af90c · GitHub

This repository has been archived by the owner on Nov 6, 2018. It is now read-only.

Commit

Merge remote-tracking branch 'origin/master'

Browse files

# Conflicts:
#	src/main/java/org/jenkinsci/plugins/fabric8/dto/LogsDTO.java
#	src/main/java/org/jenkinsci/plugins/fabric8/support/LogHelper.java

Loading branch information

jstrachan committed Oct 9, 2015

2 parents 6ee8ca0 + 95caa6e commit c2af90c