Merge branch '1.5.x' into 2.0.x

2019-06-04 14:20:25 -07:00
parent 90468c4d53 d548c5ed31
commit 7fc01971ed
24 changed files with 31 additions and 10 deletions
--- a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
@@ -3,4 +3,4 @@
 <h1>Hello</h1>
 Hello World!
 </body>
-</html>
+</html>