Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll
2016-11-12 11:16:30 +01:00
6 changed files with 6 additions and 6 deletions

View File

@@ -18,7 +18,7 @@
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
<thymeleaf-layout-dialect.version>2.0.4</thymeleaf-layout-dialect.version>
<thymeleaf-layout-dialect.version>2.1.1</thymeleaf-layout-dialect.version>
</properties>
<dependencies>
<dependency>