Merge branch '2.2.x'

Closes gh-21472
This commit is contained in:
Andy Wilkinson
2020-05-15 16:21:33 +01:00
4 changed files with 3 additions and 5 deletions

View File

@@ -2444,7 +2444,7 @@ Also, many other templating engines include their own Spring MVC integrations.
Spring Boot includes auto-configuration support for the following templating engines:
* https://freemarker.apache.org/docs/[FreeMarker]
* http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy]
* https://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy]
* https://www.thymeleaf.org[Thymeleaf]
* https://mustache.github.io/[Mustache]