Merge branch '1.5.x' into 2.0.x

2019-06-04 00:05:57 -07:00
parent eb9ffd5e7e e61f7a33a7
commit 5fba43aa31
78 changed files with 90 additions and 78 deletions
--- a/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html
@@ -22,4 +22,4 @@
 			2012 2:17:16 PM CDT</div>
 	</div>
 </body>
-</html>
+</html>