diff options
| author | Remi Collet <remi@php.net> | 2014-11-17 09:43:26 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-17 09:43:26 +0100 |
| commit | c996a9899ed3fbabb2435257891f67c70797aec6 (patch) | |
| tree | 2e83c7938b1e2ff8746d37b63857966792a25983 /sapi/apache2handler/php_functions.c | |
| parent | d9fd670fdc4a8096ce1877b2419edb04f60280c4 (diff) | |
| parent | 09f9f7ce5030973052bca5043425bd9f20ad7a7e (diff) | |
| download | php-git-c996a9899ed3fbabb2435257891f67c70797aec6.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update fpm configuration for #68428
fix incompatible pointer types
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions