Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson
2016-02-12 10:18:02 +00:00

View File

@@ -155,7 +155,7 @@
<thymeleaf-layout-dialect.version>1.3.1</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.0.30</tomcat.version>
<tomcat.version>8.0.32</tomcat.version>
<undertow.version>1.3.17.Final</undertow.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>