summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_functions.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-06 12:00:17 +0100
committerAnatol Belski <ab@php.net>2014-12-06 12:00:17 +0100
commitebaf130a15758134f9d8225bcf257d544461c5e1 (patch)
tree685eafaeab47fc612a37465da6a49c1d3185ec08 /sapi/apache2handler/php_functions.c
parentb120f9beb2a0d07c8c16d9e6cc5b1226bb863d31 (diff)
parent1b4d5ad46a60401bb3db754b4ef6888a7285e637 (diff)
downloadphp-git-ebaf130a15758134f9d8225bcf257d544461c5e1.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed bug #65230 setting locale randomly broken
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions