summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-07-16 22:41:28 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-07-16 22:41:28 +0200
commitd097dfca723596f944d61d9510310fa5140157c1 (patch)
tree077ee6560b125e0893921bc70876fd07d9295655 /main
parenta69d9f2039b2558e1f098962f13749eefd59caf8 (diff)
parentbc6979b79e1ee9b7de7efa84a938a8be49f91276 (diff)
downloadphp-git-d097dfca723596f944d61d9510310fa5140157c1.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Revert "Drop freetype from i386"
Diffstat (limited to 'main')
0 files changed, 0 insertions, 0 deletions