]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorChristoph M. Becker <cmb@php.net>
Tue, 12 Jul 2016 12:55:30 +0000 (14:55 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 12 Jul 2016 12:56:23 +0000 (14:56 +0200)
commit0667d6081268ba98b9a5628e9ed3528e48283fd1
tree67ea5b4286d19aec2b0b464c8a190447c42302f6
parentcf8c12a6b07db4b632ee0fad34d865bdd6fc0bda
parent5fbcc2b90f6245cf1c20d41d2cd07fde711ccadd
Merge branch 'PHP-7.0'

# Resolved conflicts:
# ext/intl/idn/idn.c
NEWS