]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://github.com/php/php-src into feature-getcolumnmeta
authorLetargie <valentin@famillecollet.com>
Wed, 26 Sep 2018 09:41:50 +0000 (11:41 +0200)
committerLetargie <valentin@famillecollet.com>
Wed, 26 Sep 2018 09:41:50 +0000 (11:41 +0200)

Trivial merge