]> granicus.if.org Git - php/commitdiff
Merge branch 'json_api_return_codes'
authorJakub Zelenka <bukka@php.net>
Wed, 29 Jun 2016 19:51:10 +0000 (20:51 +0100)
committerJakub Zelenka <bukka@php.net>
Wed, 29 Jun 2016 19:51:10 +0000 (20:51 +0100)

Trivial merge