diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-01 12:48:08 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-01 12:49:25 -0700 |
| commit | 2d9399af3514189375f34610acc33a34de44d772 (patch) | |
| tree | da7519332b5e8060d6ae7c16ce09ef1cc88b4e55 /Zend/zend_API.c | |
| parent | 978128b446f5f45816495fac4c5361a28621cd25 (diff) | |
| download | php-git-2d9399af3514189375f34610acc33a34de44d772.tar.gz | |
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
This reverts commit aa22e80b1af500e5d6cdc0f7783537a768d0e373, reversing
changes made to 3e7f47cb039fd8803776eaf2899d576c503cdb63.
Conflicts:
ext/date/php_date.c
Diffstat (limited to 'Zend/zend_API.c')
0 files changed, 0 insertions, 0 deletions