]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Sat, 12 Nov 2016 09:59:24 +0000 (09:59 +0000)
committerJoe Watkins <krakjoe@php.net>
Sat, 12 Nov 2016 09:59:24 +0000 (09:59 +0000)
* PHP-7.0:
  added a test for date_interval_format function
  Merge branch 'pull-request/2198'


Trivial merge