Merge branch '2.1.x'

Closes gh-18875
2019-11-05 09:19:51 +01:00 · 2019-11-05 09:19:51 +01:00 · da24a66ce6
parent c2e11da5ba c78010599a
commit da24a66ce6
1 changed files with 1 additions and 0 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -3743,6 +3743,7 @@ You can define beans for the following jOOQ Types:
 * `TransactionProvider`
 * `RecordMapperProvider`
 * `RecordUnmapperProvider`
+* `Settings`
 * `RecordListenerProvider`
 * `ExecuteListenerProvider`
 * `VisitListenerProvider`