Commit 0641d9af authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.3.x'

parents 9836d6ef 815da8b8
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<thymeleaf-layout-dialect.version>1.3.1</thymeleaf-layout-dialect.version> <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-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.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> <undertow.version>1.3.17.Final</undertow.version>
<velocity.version>1.7</velocity.version> <velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version> <velocity-tools.version>2.0</velocity-tools.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment