]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorRemi Collet <remi@php.net>
Wed, 3 Aug 2016 09:03:35 +0000 (11:03 +0200)
committerRemi Collet <remi@php.net>
Wed, 3 Aug 2016 09:03:35 +0000 (11:03 +0200)
* PHP-7.1:
  add skipif (needs json)


Trivial merge