Merge branch '1.2.x'

2016-01-12 10:13:12 +00:00 · 2016-01-12 10:13:12 +00:00 · e4e9a71753
parent d8384c52df 8410e545b5
commit e4e9a71753
2 changed files with 2 additions and 2 deletions
--- a/eclipse/org.eclipse.jdt.ui.prefs
+++ b/eclipse/org.eclipse.jdt.ui.prefs
--- a/spring-boot-docs/src/main/asciidoc/index-docinfo.xml
+++ b/spring-boot-docs/src/main/asciidoc/index-docinfo.xml
@ -1,7 +1,7 @@
 <productname>Spring Boot</productname>
 <releaseinfo>{spring-boot-version}</releaseinfo>
 <copyright>
-	<year>2013-2015</year>
+	<year>2013-2016</year>
 </copyright>
 <legalnotice>
 	<para>