]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Tue, 13 Jun 2017 06:50:10 +0000 (08:50 +0200)
committerRemi Collet <remi@php.net>
Tue, 13 Jun 2017 06:50:10 +0000 (08:50 +0200)
* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()

1  2 
ext/intl/collator/collator_class.c
ext/intl/php_intl.c

Simple merge
Simple merge