Commit f4b01016 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x' into 2.0.x

parents 263e157e 3a2c9622
......@@ -2229,7 +2229,7 @@ integrations.
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://www.thymeleaf.org[Thymeleaf]
* https://mustache.github.io/[Mustache]
......@@ -2660,7 +2660,7 @@ Thymeleaf, FreeMarker, and Mustache.
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://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