merge
Merge branch 'dev' into gh-pages
update kity
Merge branch 'gh-pages' of https://github.com/kitygraph/kitycharts into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
fex
fex
字体
Merge branch 'dev' into gh-pages
fontfamily
conflict
fontfamily
merge conflict
fontfamily
changed highlight
highlight
fixed
fixed bug