Merge branch 'fix-doc-measurements' of https://github.com/ddrscott/html2canvas into ddrscott-fix-doc-measurements

Browse Source

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

...

This commit is contained in:

MoyuScript

2014-09-20 17:40:09 +03:00

parent 15599b520d 887bdc3927

commit a101b4acbf

3 changed files with 22 additions and 50 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

4

dist/html2canvas.min.js vendored

File diff suppressed because one or more lines are too long