root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
pull/7086/head
Andy Wilkinson 8 years ago
parent 7d68c14d03 6ac041c43b
commit 7962818294
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
spring-boot-docs/src/main/asciidoc/howto.adoc
Unescape Escape View File

@ -1435,7 +1435,7 @@ By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. If you are using
---- ----
<properties> <properties>
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
<thymeleaf-layout-dialect.version>2.0.3</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>2.0.4</thymeleaf-layout-dialect.version>
</properties> </properties>
---- ----

4
spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml
Unescape Escape View File

@ -17,8 +17,8 @@
</organization> </organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<thymeleaf.version>3.0.0.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
<thymeleaf-layout-dialect.version>2.0.0</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>2.0.4</thymeleaf-layout-dialect.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

Write Preview
Loading…
Cancel
Save