Merge branch '1.5.x'

pull/7127/merge
Stephane Nicoll 8 years ago
commit 3a86e26977

@ -1436,7 +1436,7 @@ By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. If you are using
<properties> <properties>
<thymeleaf.version>3.0.0.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.0.RELEASE</thymeleaf.version>
<thymeleaf-layout-dialect.version>2.0.3</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>2.0.3</thymeleaf-layout-dialect.version>
</dependency> </properties>
---- ----
NOTE: if you are managing dependencies yourself, look at `spring-boot-dependencies` for NOTE: if you are managing dependencies yourself, look at `spring-boot-dependencies` for

Loading…
Cancel
Save