Merge branch 'master' of https://github.com/niklasvh/html2canvas

Browse Source

Conflicts:
	build/html2canvas.min.js
	dist/html2canvas.js
	src/core.js

...

This commit is contained in:

MoyuScript

2014-09-04 16:20:49 -05:00

parent 22a3b75f5f 588f490005

commit 887bdc3927

16 changed files with 171 additions and 137 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1885

dist/html2canvas.js vendored Normal file

File diff suppressed because one or more lines are too long

8

dist/html2canvas.min.js vendored Normal file

File diff suppressed because one or more lines are too long