]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 7 Jan 2017 11:44:56 +0000 (12:44 +0100)
committerAnatol Belski <ab@php.net>
Sat, 7 Jan 2017 11:44:56 +0000 (12:44 +0100)
commit9845155aa2271b4d2a2f8d81e6a43cde8b11e4fe
treec55637be990fe0721d3639ed0b044c5eadeedd83
parentbba09d56e597db1dc136c798fec3392aec71518e
parent80a5ae4f5389e66fe4bd71b54c7fb8fca06d831b
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix wrong version
  extend UPGRADING