]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorPierrick Charron <pierrick@php.net>
Thu, 28 Jul 2016 03:36:22 +0000 (23:36 -0400)
committerPierrick Charron <pierrick@php.net>
Thu, 28 Jul 2016 03:36:22 +0000 (23:36 -0400)
commitbf37b97d9cedccf01f6b1cfe9ee61102ac14e2a0
tree843dd42a9c957725eac14809771ccb25ef0b2046
parent1b681880c148a360be6e8835ed974ad149ebf32c
parent30a5ed3a7979f1b865f6633cb16b5f3e78371df1
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/curl/interface.c
NEWS
UPGRADING
ext/curl/interface.c