]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9d1dc3 5515937)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Thu, 30 Oct 2014 17:14:37 +0000 (18:14 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 30 Oct 2014 17:14:37 +0000 (18:14 +0100)
commit067852ca615bd083e821a08dbc21c21e9d46306f
tree4bae67b6cb1c98aeaaafda22a6f4c2a583ea7af7tree | snapshot
parentb9d1dc329f9065be9e839ce7cb61b57da45a4f9acommit | diff
parent551593707384364705cd954a52c6e4089805f0efcommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  don't try to send in the test results until we restored qa.php.net
  Don't treat warnings as failures in the junit output

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