editor
Merge branch 'master' of https://github.com/306808700/WKeditor
Merge pull request #8 from kissygalleryteam/master

Merge pull request #7 from 306808700/master
Merge pull request #8 from 306808700/master

Auto merge by kpm server