]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50c5d13 f5b4aae)
Merge branch 'json_encode_fail_return' into PHP-7.1
authorJakub Zelenka <bukka@php.net>
Mon, 29 Aug 2016 14:01:00 +0000 (15:01 +0100)
committerJakub Zelenka <bukka@php.net>
Mon, 29 Aug 2016 14:01:00 +0000 (15:01 +0100)

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