]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Sun, 8 Jan 2017 21:05:24 +0000 (21:05 +0000)
committerJoe Watkins <krakjoe@php.net>
Sun, 8 Jan 2017 21:05:24 +0000 (21:05 +0000)
* PHP-7.0:
  Use proper file extension for the README


Trivial merge