Skip to content

S
spring-boot
Commit f4b01016 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.5.x' into 2.0.x

parents 263e157e 3a2c9622
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @ f4b01016
...@@ -2229,7 +2229,7 @@ integrations. ...@@ -2229,7 +2229,7 @@ integrations.
Spring Boot includes auto-configuration support for the following templating engines: Spring Boot includes auto-configuration support for the following templating engines:
* https://freemarker.org/docs/[FreeMarker] * https://freemarker.apache.org/docs/[FreeMarker]
* http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy] * http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy]
* http://www.thymeleaf.org[Thymeleaf] * http://www.thymeleaf.org[Thymeleaf]
* https://mustache.github.io/[Mustache] * https://mustache.github.io/[Mustache]
...@@ -2660,7 +2660,7 @@ Thymeleaf, FreeMarker, and Mustache. ...@@ -2660,7 +2660,7 @@ Thymeleaf, FreeMarker, and Mustache.
Spring Boot includes auto-configuration support for the following templating engines: Spring Boot includes auto-configuration support for the following templating engines:
* http://freemarker.org/docs/[FreeMarker] * https://freemarker.apache.org/docs/[FreeMarker]
* http://www.thymeleaf.org[Thymeleaf] * http://www.thymeleaf.org[Thymeleaf]
* http://mustache.github.io/[Mustache] * http://mustache.github.io/[Mustache]
......
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