Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson
2016-06-01 14:18:06 +01:00

View File

@@ -172,7 +172,7 @@
<thymeleaf-layout-dialect.version>1.4.0</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.35</tomcat.version>
<tomcat.version>8.0.33</tomcat.version>
<undertow.version>1.3.22.Final</undertow.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>