summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-07-07 01:36:24 -0700
committerStanislav Malyshev <stas@php.net>2014-07-07 01:36:24 -0700
commit432bb7abe5effd0978b7c7e09e46630c1a6826d3 (patch)
tree0c8d13eb5f3f86aa6047a443c1391010e84a4331 /sapi/cli/php_cli_server.c
parent04a227dd1610355ce2a86a3bad718c86eed1e6fa (diff)
parentc4029561782234abb0b8b463f546f794ad03f1cc (diff)
downloadphp-git-432bb7abe5effd0978b7c7e09e46630c1a6826d3.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: change locale - looks like not everybody has sl_SI
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions