]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c370683 a3a0e49)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Mon, 1 Dec 2014 09:14:32 +0000 (10:14 +0100)
committerFerenc Kovacs <tyrael@php.net>
Mon, 1 Dec 2014 09:14:32 +0000 (10:14 +0100)
commitd964832255b266c6e0c99efcebce3e0ae85fd080
treec1e1e33530634e3326df094e4b5b3399b38273e7tree | snapshot
parentc370683903adf740b330755cfb01cc2da5df7cb0commit | diff
parenta3a0e49586b2bf37b7969f6f5722d9b2aa797356commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.

Conflicts:
.travis.yml
.travis.yml diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.