diff options
| author | Andrey Hristov <andrey@php.net> | 2014-01-28 15:57:48 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-01-28 15:57:48 +0200 |
| commit | 3834771b2ef7f6d03cd9b8da2a3da14501f58906 (patch) | |
| tree | b8296c9cf245745ad980f4ce8e7219319f6381ab /main/php_ini.c | |
| parent | d9078c7c8d3e957696797539f6140e8680974124 (diff) | |
| parent | 79ab514f0c114d572b6afc1d5b2decd2d512f19e (diff) | |
| download | php-git-3834771b2ef7f6d03cd9b8da2a3da14501f58906.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
NEWS
UPGRADING
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions