Merge branch 'hotfix/readme_update' into develop

# Conflicts:
#	README.md


Former-commit-id: ce532183476f37ab5b075ce25859e6022909eb81 [formerly ce532183476f37ab5b075ce25859e6022909eb81 [formerly ce532183476f37ab5b075ce25859e6022909eb81 [formerly ce532183476f37ab5b075ce25859e6022909eb81 [formerly 7658dcddee29d444a8dacf3d30c579c18168143a [formerly 3fd3b1e1a7a86ddf88a7fcfc0b9a92c4d371b426]]]]]
Former-commit-id: 46bb0564ae683fbc58009f49a1de2e21660f52e9
Former-commit-id: 85fd21aa6d50fada28e472061a577df1d1baa2fd
Former-commit-id: 76460590f556a08e671e776d419a63b0ddd139a5 [formerly 7f23d5748aa44e840bffcf6effbb176b0b65f7c3]
Former-commit-id: f42020fc8789c1cd8a155855b59febddb2abc99d
Former-commit-id: a6d636fa9e14e494124f3bf19e096e2c44f4d992
Former-commit-id: 4c4c3c425a35e0daddf7d7fd44dae64fedc43a19
Former-commit-id: 5d71519c916642eaba714fb5e91e77cb1779efac
Former-commit-id: cfb7457ce3a4437b8dfae4659ae92147190cbd5f
This commit is contained in:
liyang
2018-09-04 09:59:35 +08:00

View File

@@ -0,0 +1 @@
2ef12d88b2011063784c37f8b8490336503a5f88