Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-15 11:06:45 +01:00
commit d4fa5fa1cf

View File

@ -125,7 +125,7 @@
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<tomcat.version>7.0.55</tomcat.version>
<tomcat.version>7.0.56</tomcat.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>
<wsdl4j.version>1.6.3</wsdl4j.version>