Merge branch '2.0.x' into 2.1.x

2019-06-04 14:21:09 -07:00
parent 930d110178 7fc01971ed
commit 0ef331018e
31 changed files with 38 additions and 17 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>