Merge branch '1.4.x' into 1.5.x

2017-01-13 15:40:11 -05:00
parent c04f79fd74 1afb050061
commit 426435f4af
19 changed files with 19 additions and 19 deletions
--- a/spring-boot-parent/src/checkstyle/checkstyle-header.txt
+++ b/spring-boot-parent/src/checkstyle/checkstyle-header.txt
@@ -1,5 +1,5 @@
 ^\Q/*\E$
-^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
+^\Q * Copyright \E2012-20\d\d\Q the original author or authors.\E$
 ^\Q *\E$
 ^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
 ^\Q * you may not use this file except in compliance with the License.\E$