Merge branch 'master' into v1.5

juzhiyuan · web-flow · commit c2ce4c9d663c · 2020-08-09T17:16:22.000+08:00
diff --git a/compose/README.md b/compose/README.md
@@ -17,4 +17,4 @@
 #
 -->
 
-This folder stores the `docker-compose` file for `manager-api`.
+This folder stores the `docker-compose` file for `manager-api`.

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@`
`17`	`17`	`#`
`18`	`18`	`-->`
`19`	`19`
`20`		-This folder stores the `docker-compose` file for `manager-api`.
	`20`	+This folder stores the `docker-compose` file for `manager-api`.