]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorSara Golemon <pollita@php.net>
Fri, 6 Jul 2018 14:05:17 +0000 (10:05 -0400)
committerSara Golemon <pollita@php.net>
Fri, 6 Jul 2018 14:05:17 +0000 (10:05 -0400)
* PHP-7.1:
  Fix year
  Bump version


Trivial merge