Merge branch 'master' into 'full-function'

# Conflicts: # README.md

Merge branch 'master' into 'full-function'
# Conflicts: # README.md
fd49891e · joliu · 13f2b7dc · 14ac0762 · fd49891e
Commit fd49891e authored Jun 28, 2020 by joliu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

README.md README.md +2 -1

No files found.
--- a/README.md
+++ b/README.md
-# Typhoon
+<<<<<<< README.md
+# OpenCPS
 ## 无中心式物联网系统
 ### 新版本更新历史