Merge branch 'master' of https://github.com/ecomfe/zrender · ecomfe/zrender@b675dba · GitHub

Commit

Merge branch 'master' of https://github.com/ecomfe/zrender

Browse files

Conflicts:
	src/Handler.js

Loading branch information

pissang committed Jan 11, 2016

2 parents 9aadee4 + 0a8d06e commit b675dba