Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

1
2
//>>built
define("dojo/_base/kernel dojo/_base/lang ./xml/DomParser ./sketch/UndoStack ./sketch/Figure ./sketch/Toolbar".split(" "),function(a){a.getObject("sketch",!0,dojox);return dojox.sketch});