Commit 00233cd5 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x' into 2.0.x

parents ea2fb620 0960f796
...@@ -583,7 +583,7 @@ NOTE: `@SpringBootApplication` also provides aliases to customize the attributes ...@@ -583,7 +583,7 @@ NOTE: `@SpringBootApplication` also provides aliases to customize the attributes
[NOTE] [NOTE]
==== ====
None of these features are mandatory and you may chose to replace this single annotation None of these features are mandatory and you may choose to replace this single annotation
by any of the features that it enables. For instance, you may not want to use component by any of the features that it enables. For instance, you may not want to use component
scan in your application: scan in your application:
......
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