Merge branch '1.5.x' into 2.0.x

2018-05-25 18:45:37 -07:00
parent 606eb9dda3 e69296d7d3
commit 21d80d87a3
94 changed files with 401 additions and 341 deletions
--- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/resources/application.properties
@@ -1,3 +1,3 @@
 spring.mvc.view.prefix: /WEB-INF/jsp/
 spring.mvc.view.suffix: .jsp
-application.message: Hello Phil
+application.message: Hello Phil