Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2016-01-12 10:13:12 +00:00
commit e4e9a71753
2 changed files with 2 additions and 2 deletions

File diff suppressed because one or more lines are too long

View File

@ -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>2013-2015</year> <year>2013-2016</year>
</copyright> </copyright>
<legalnotice> <legalnotice>
<para> <para>