Merge branch '2.5.x' into 2.6.x

Closes gh-29198
This commit is contained in:
Stephane Nicoll
2022-01-02 11:25:46 +01:00
4 changed files with 4 additions and 4 deletions

View File

@@ -1 +1 @@
copyright-year=2012-2021
copyright-year=2012-2022