Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' of bitbucket.org:ascribe/onion into AD-425-took-45-min-to-upload-an-11-s-vid

Browse Source

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js

...

This commit is contained in:

Tim Daubenschütz 2015-09-03 17:09:52 +02:00

parent a4a0e9d149 943f854fcc

commit a6de57e19c

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

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

Diff Content Not Available