Merge branch '1.0.x'

This commit is contained in:
Andy Wilkinson
2014-05-27 15:03:57 +01:00

View File

@@ -101,7 +101,7 @@
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-layout-dialect.version>1.2.4</thymeleaf-layout-dialect.version>
<tomcat.version>7.0.53</tomcat.version>
<tomcat.version>7.0.54</tomcat.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>
</properties>