diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-07 10:42:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-07 10:42:13 -0700 |
| commit | 41448bff7cd00623f7b43e9aff0a443e7731e93b (patch) | |
| tree | a3fd93537aee2a365e5d4293544d22a30a5afc9d /sapi/cli/php_cli_server.c | |
| parent | 31b395ac688d4d68de38c4efbc3c00fa9245c4eb (diff) | |
| parent | 551696363332942d26209368f441f6f152be4769 (diff) | |
| download | php-git-41448bff7cd00623f7b43e9aff0a443e7731e93b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
create locales and re-add test
Conflicts:
.travis.yml
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions