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

Merge branch '1.5.x' into 2.0.x

Browse Source
pull/14032/merge
Stephane Nicoll 6 years ago
parent 263e157ef0 3a2c962215
commit f4b0101632
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
Unescape Escape View File

@ -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.
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]

Write Preview
Loading…
Cancel
Save