]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7c444b db89095)
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Fri, 6 Jan 2017 05:27:08 +0000 (06:27 +0100)
committerRemi Collet <remi@php.net>
Fri, 6 Jan 2017 05:27:08 +0000 (06:27 +0100)
* PHP-5.6:
  add skip when json not loaded


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.