]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Thu, 3 May 2018 14:43:59 +0000 (16:43 +0200)
committerAnatol Belski <ab@php.net>
Thu, 3 May 2018 14:43:59 +0000 (16:43 +0200)
* PHP-7.1:
  Fixed bug #74385 Locale::parseLocale() broken with some arguments


Trivial merge