summaryrefslogtreecommitdiff
path: root/sapi/apache_hooks/php_apache.c
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-02-04 17:40:07 +0100
committerJulien Pauli <jpauli@php.net>2015-02-04 17:40:07 +0100
commit58dee64f51a308b6680a2954d5ba190d95cb2c0f (patch)
treebed6988d01a19130b56e2bdfaecfbbe5126c438c /sapi/apache_hooks/php_apache.c
parentf262e5f250908f9c2b6455227dc2577dfb56ce85 (diff)
parent583af4979b7f71c37b19f906b7504a77dd52652b (diff)
downloadphp-git-58dee64f51a308b6680a2954d5ba190d95cb2c0f.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
Diffstat (limited to 'sapi/apache_hooks/php_apache.c')
0 files changed, 0 insertions, 0 deletions