]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 23 Apr 2019 10:43:37 +0000 (12:43 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 23 Apr 2019 10:43:37 +0000 (12:43 +0200)
1  2 
ext/json/json_encoder.c

Simple merge