diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-01 12:48:08 -0700 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-04-15 19:35:18 +0200 |
| commit | 5904e1e55e3a774dd8bea37b34ea6965bf2cdbf3 (patch) | |
| tree | 6f9b3c0f0e31d99eb98ccc205416d768f58460a7 /sapi/apache2handler/php_functions.c | |
| parent | bef6df6a7eedc659a7ddfbad1eb457c193ed6bb8 (diff) | |
| download | php-git-5904e1e55e3a774dd8bea37b34ea6965bf2cdbf3.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 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions