Merge branch 'master' into 'feature1'

# Conflicts: # README.txt

Merge branch 'master' into 'feature1'
# Conflicts: # README.txt
32e38068 · 砂漠的毒虫 · cb09c4f0 · f1ebb1d5 · 32e38068
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

README.txt README.txt +1 -1

未找到文件。
--- a/README.txt
+++ b/README.txt
-Creating a new branch is quick AND simple.
\ No newline at end of file
+Creating a new branch is quick and simple.
\ No newline at end of file