]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 593d373 c4d7cfa)
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)
commit90f33b1ac733771f0e6b7480efa96879f5f488e9
tree0e927d9a2cf139d2f2d9971edcd80f8c4aaaab47tree | snapshot
parent593d37376b272f990a3007957a037b57e570216ecommit | diff
parentc4d7cfa53631dcfb5e4dd3b736324ad3d15f2f59commit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
ext/intl/collator/collator_class.c diff1 | diff2 | blob | history
ext/intl/php_intl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.