Merge branch '1.1.x'

This commit is contained in:
Dave Syer
2014-08-11 17:43:14 -07:00
13 changed files with 402 additions and 36 deletions

View File

@@ -53,6 +53,7 @@
<module>spring-boot-sample-web-groovy-templates</module>
<module>spring-boot-sample-web-method-security</module>
<module>spring-boot-sample-web-secure</module>
<module>spring-boot-sample-web-secure-custom</module>
<module>spring-boot-sample-web-static</module>
<module>spring-boot-sample-web-jsp</module>
<module>spring-boot-sample-web-ui</module>