]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 8 Sep 2020 08:28:07 +0000 (10:28 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 8 Sep 2020 08:28:07 +0000 (10:28 +0200)
* PHP-7.4:
  Revert "Update libzip on macos"
  Revert "Manually build re2c on macos"


Trivial merge