]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9fd670 09f9f7c)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 17 Nov 2014 08:43:26 +0000 (09:43 +0100)
committerRemi Collet <remi@php.net>
Mon, 17 Nov 2014 08:43:26 +0000 (09:43 +0100)
* PHP-5.5:
  update fpm configuration for #68428
  fix incompatible pointer types


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.