diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-06-11 14:59:39 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-06-11 14:59:39 +0200 |
commit | ec974c439724e8b4151412eaa0caba5aec5e1c49 (patch) | |
tree | 975b9f0da0864ece1d90a47478182cf4dd25224b /sapi/cli/php_cli_server.c | |
parent | 6953d33d309b2d390f829e2708339598fbc83415 (diff) | |
parent | c38ab260fe3a40cce049c835fb7833de00ab977c (diff) | |
download | php-git-ec974c439724e8b4151412eaa0caba5aec5e1c49.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "Add optional second arg to unserialize()"
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions