]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a69d9f2 bc6979b)
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Jul 2020 20:41:28 +0000 (22:41 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Jul 2020 20:41:28 +0000 (22:41 +0200)
* PHP-7.4:
  Revert "Drop freetype from i386"

1  2 
azure/i386/job.yml patch | diff1 | diff2 | blob | history

diff --cc azure/i386/job.yml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.