Merge remote-tracking branch 'upstream/master' · dutchiexl/BehatHtmlFormatterPlugin@6099a17 · GitHub

Commit

Merge remote-tracking branch 'upstream/master'

Browse files

# Conflicts:
#	README.md
#	assets/Twig/css/style.css
#	src/BehatHTMLFormatterExtension.php
#	src/Classes/Scenario.php
#	src/Classes/Step.php
#	src/Formatter/BehatHTMLFormatter.php
#	src/Renderer/TwigRenderer.php
#	templates/index.html.twig

Signed-off-by: lmrafael <[email protected]>

Loading branch information

lmrafael committed May 26, 2015

2 parents a11a9cd + 0597412 commit 6099a17