diff options
| author | Adam Harvey <aharvey@php.net> | 2014-12-05 13:58:19 -0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-12-05 13:58:19 -0800 |
| commit | 381fd62ccf9ee6889c964c2be6cf1712a9ac4562 (patch) | |
| tree | c348e592e9f42ceb2f91d79e00e86572577e7643 /sapi/apache2handler/php_functions.c | |
| parent | 0e67973e9a2707f0010ac9a65020f62b5cb104fb (diff) | |
| parent | 79131b46176d136743274f802cfc87418c4294db (diff) | |
| download | php-git-381fd62ccf9ee6889c964c2be6cf1712a9ac4562.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert unintentional docblock change
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions