]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 12 Jan 2017 20:14:42 +0000 (21:14 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 12 Jan 2017 20:15:57 +0000 (21:15 +0100)
commitda5e09ad0389f53cdc78591442a3df1ff54c6ff0
treeeb0eebcbc70e392348e4966a41d17d0896903070
parentaf2de536d35c9a450b12d9c9f207898e9d864951
parentbd75f9e61375c7632bb55b0d49b470ecd94e8ec7
Merge branch 'PHP-7.0' into PHP-7.1
NEWS
ext/mysqlnd/mysqlnd_ps.c