]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 1 Dec 2014 09:15:42 +0000 (10:15 +0100)
committerFerenc Kovacs <tyrael@php.net>
Mon, 1 Dec 2014 09:15:42 +0000 (10:15 +0100)
* PHP-5.6:
  Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.

1  2 
.travis.yml

diff --cc .travis.yml
Simple merge