Merge remote-tracking branch 'springsource/1.2.x'

This commit is contained in:
Phillip Webb
2015-10-15 21:52:28 -07:00
8 changed files with 169 additions and 9 deletions

View File

@@ -87,6 +87,7 @@
<module>spring-boot-sample-undertow</module>
<module>spring-boot-sample-undertow-ssl</module>
<module>spring-boot-sample-velocity</module>
<module>spring-boot-sample-war</module>
<module>spring-boot-sample-web-freemarker</module>
<module>spring-boot-sample-web-groovy-templates</module>
<module>spring-boot-sample-web-method-security</module>