diff options
| author | Matteo Beccati <mbeccati@php.net> | 2016-04-05 00:07:02 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2016-04-05 00:07:02 +0200 |
| commit | 4090e709aa3505e414243d4e19e18804ea8371e4 (patch) | |
| tree | 28f584fee54edc03efda45ba3f95a78051b10f57 /ext/date/php_date.c | |
| parent | d2948d4b71cefe31b686e6354ba06cc675537e78 (diff) | |
| parent | 30925cd49826c59ea8459a24bcb24d47c2ce562d (diff) | |
| download | php-git-4090e709aa3505e414243d4e19e18804ea8371e4.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #71447 (Quotes inside comments not properly handled)
Fixed a few PDO tests to conform to PDO Common standards
news entry #69537
Fix #69537: __debugInfo with empty string for key gives error
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'ext/date/php_date.c')
0 files changed, 0 insertions, 0 deletions