Merge branch 'develop' into release

2020-09-24 08:44:55 +08:00 · 2020-09-24 08:44:55 +08:00 · 817c35d422
parent 6a2b2e3da8 7d60852eeb
commit 817c35d422
2 changed files with 4 additions and 0 deletions
--- a/file_in_feature-1.txt
+++ b/file_in_feature-1.txt
@ -0,0 +1,4 @@
+Hello you there.
+zhzhy.
+zhzhy@chinaweal.com.cn
+xiao
--- a/file_in_feature2.txt
+++ b/file_in_feature2.txt