Merge branch '2.3.x' into 2.4.x

Closes gh-24626
pull/24986/head
Stephane Nicoll 4 years ago
commit 052565ef2b

@ -1,5 +1,5 @@
Spring Boot ${version} Spring Boot ${version}
Copyright (c) 2012-2020 Pivotal, Inc. Copyright (c) 2012-2021 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0 This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with (the "License"). You may not use this product except in compliance with

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

@ -1,7 +1,7 @@
<productname>Spring Boot</productname> <productname>Spring Boot</productname>
<releaseinfo>{spring-boot-version}</releaseinfo> <releaseinfo>{spring-boot-version}</releaseinfo>
<copyright> <copyright>
<year>2012-2020</year> <year>2012-2021</year>
</copyright> </copyright>
<legalnotice> <legalnotice>
<para> <para>

@ -3,7 +3,7 @@
{spring-boot-version} {spring-boot-version}
Copyright &#169; 2012-2020 Copyright &#169; 2012-2021
Copies of this document may be made for your own use and for distribution to Copies of this document may be made for your own use and for distribution to
others, provided that you do not charge any fee for such copies and further others, provided that you do not charge any fee for such copies and further

Loading…
Cancel
Save