]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Sat, 13 Jun 2020 16:33:17 +0000 (18:33 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sat, 13 Jun 2020 16:33:17 +0000 (18:33 +0200)
* PHP-7.4:
  Fix #79687: Sony picture - PHP Warning - Make, Model, MakerNotes

1  2 
ext/exif/exif.c

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