]> granicus.if.org Git - php/commit
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 13 Jun 2017 14:17:57 +0000 (17:17 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 13 Jun 2017 14:17:57 +0000 (17:17 +0300)
commitef4b2fc283ddaf9bd692015f1db6dad52171c3ce
treed67458e007612a9ac71ccdf83bf168fd426012b2
parent02778731b75562edd3ecdd0f75298668afeb163a
parent362d2e42a02fe018a7d1261a53ff59b73fed91f6
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY