Merge pull request #6927 from chentao1596/patch-1

Update conventions.md
This commit is contained in:
Xiaoyu(Tim) Zhang
2018-01-11 10:55:27 +08:00
committed by GitHub