]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 2 Nov 2017 11:41:01 +0000 (14:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 2 Nov 2017 11:41:01 +0000 (14:41 +0300)
* 'master' of git.php.net:php-src:
  Sync and fix tests for ICU 60.1 compat


Trivial merge