diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-08-12 14:46:38 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-12 14:46:38 +0400 |
commit | 05eaed43453bf74144bc6115db641e9e8a41d568 (patch) | |
tree | 3a8a5de818ba713bcbcecae35462c61b077f54f6 /sapi/cli/php_cli_server.c | |
parent | 06476e5291b93832a2061eb58585a9ddcf6ff860 (diff) | |
parent | b3468662de5b9f96ef27b4059556bbb0da113645 (diff) | |
download | php-git-05eaed43453bf74144bc6115db641e9e8a41d568.tar.gz |
Merge branch 'master' into phpng
* master:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions