From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 2 Feb 2021 15:46:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1cf5534370c5e82d0e3117c65e04840112ee44c;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Update year to 2021
---

f1cf5534370c5e82d0e3117c65e04840112ee44c