Merge branch '2.1.x'

2019-06-04 14:31:57 -07:00
parent e06325e029 0ef331018e
commit db75347eb6
36 changed files with 45 additions and 39 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>