diff options
| author | Julien Pauli <jpauli@php.net> | 2014-12-12 15:07:33 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-12-12 16:11:26 +0100 |
| commit | d5dd29ce5c28ee2d04107304bb084c4b79158da7 (patch) | |
| tree | 34789fefc89c7f58b194e56e0c859614f5039c52 /sapi/apache2handler/php_functions.c | |
| parent | d1a2c1522188481d9b54120e3f17dd9243c11d90 (diff) | |
| parent | d6eb3b49c878ce01f1d9d73eebc4d9fec4330573 (diff) | |
| download | php-git-d5dd29ce5c28ee2d04107304bb084c4b79158da7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions