diff options
author | Julien Pauli <jpauli@php.net> | 2015-02-04 17:39:34 +0100 |
---|---|---|
committer | Julien Pauli <jpauli@php.net> | 2015-02-04 17:39:34 +0100 |
commit | 583af4979b7f71c37b19f906b7504a77dd52652b (patch) | |
tree | 935dea08d930c1b08450f0e84c4f36965c5371c5 /ext/mysql/php_mysql.h | |
parent | 421d309908f56c13050e132ff3fadd2682ce0220 (diff) | |
parent | f51b73c833ef88761780487da610d7e94e68ad47 (diff) | |
download | php-git-583af4979b7f71c37b19f906b7504a77dd52652b.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions