Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-08-26 15:02:45 +01:00
commit 07ec9bb849
1 changed files with 1 additions and 1 deletions

View File

@ -152,7 +152,7 @@
<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
<thymeleaf-layout-dialect.version>1.2.9</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<tomcat.version>8.0.23</tomcat.version>
<tomcat.version>8.0.26</tomcat.version>
<undertow.version>1.2.10.Final</undertow.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>