Merge branch '1.1.x'

2014-08-26 09:19:14 +01:00
parent fcebf9d360 95d65c2ff5
commit 3404850b2e
10 changed files with 181 additions and 18 deletions
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -49,6 +49,7 @@
 		<module>spring-boot-sample-tomcat-multi-connectors</module>
 		<module>spring-boot-sample-tomcat8-jsp</module>
 		<module>spring-boot-sample-traditional</module>
+		<module>spring-boot-sample-velocity</module>
 		<module>spring-boot-sample-web-freemarker</module>
 		<module>spring-boot-sample-web-groovy-templates</module>
 		<module>spring-boot-sample-web-method-security</module>