]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorJoe Watkins <krakjoe@php.net>
Wed, 4 Jan 2017 14:37:11 +0000 (14:37 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 4 Jan 2017 14:37:11 +0000 (14:37 +0000)
* 'master' of git.php.net:/php-src:
  Implement #69606: Support BMPs (added in GD 2.1.0)


Trivial merge