Merge branch '1.5.x' into 2.0.x

2019-06-04 00:05:57 -07:00
parent eb9ffd5e7e e61f7a33a7
commit 5fba43aa31
78 changed files with 90 additions and 78 deletions
--- a/spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml
+++ b/spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml
@@ -1,3 +1,3 @@
 test:
  foo:
-    bar: value
+    bar: value