]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.4' into master
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 27 Aug 2020 08:25:01 +0000 (10:25 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 27 Aug 2020 08:26:15 +0000 (10:26 +0200)
commitf956434df280003994e931197cd6f648f3ea8486
treef531e4c713cbca4e5a6c6596b10a080507244c91
parentbd6feb7b120bcfe0436ec878ea0f8e260ddcf772
parent296030119cec2c1c543b3397dc84977e592a4747
Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Catch potential exceptions during to string conversion
ext/com_dotnet/com_com.c
ext/com_dotnet/com_saproxy.c