]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 18 Feb 2019 16:51:41 +0000 (17:51 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 18 Feb 2019 16:51:41 +0000 (17:51 +0100)
1  2 
ext/exif/exif.c
ext/ffi/ffi.c
ext/reflection/php_reflection.c
ext/standard/basic_functions.c
ext/standard/string.c
ext/tidy/tidy.c

diff --cc ext/exif/exif.c
Simple merge
diff --cc ext/ffi/ffi.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ext/tidy/tidy.c
Simple merge