]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJohannes Schlüter <johannes@php.net>
Fri, 14 Apr 2017 14:31:19 +0000 (16:31 +0200)
committerJohannes Schlüter <johannes@php.net>
Fri, 14 Apr 2017 14:31:19 +0000 (16:31 +0200)
1  2 
ext/mysqlnd/mysqlnd_charset.c

Simple merge