Merge branch '2.0.x' into 2.1.x

2019-06-04 02:07:14 -07:00
parent d057f49618 b442d3b906
commit ccfbd03482
107 changed files with 130 additions and 112 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