]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorMatteo Beccati <mbeccati@php.net>
Sun, 27 Nov 2016 09:08:04 +0000 (10:08 +0100)
committerMatteo Beccati <mbeccati@php.net>
Sun, 27 Nov 2016 09:08:04 +0000 (10:08 +0100)
* PHP-5.6:
  Added missing array key to $JUNIT

1  2 
run-tests.php

diff --cc run-tests.php
Simple merge