]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
authorFrank Denis <github@pureftpd.org>
Sun, 30 Jul 2017 13:42:24 +0000 (15:42 +0200)
committerFrank Denis <github@pureftpd.org>
Sun, 30 Jul 2017 13:42:24 +0000 (15:42 +0200)
* 'PHP-7.2' of git.php.net:php-src:
  Shrink test image


Trivial merge