Tim Daubenschütz f16a012771 Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract ...

Sync with master

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js

2015-09-16 13:45:24 +02:00

..

ascribe_file_drag_and_drop

First cut: Upload button for contract settings

2015-09-15 16:35:45 +02:00

ascribe_upload_button

finalize contract update button

2015-09-16 09:47:22 +02:00

vendor

update fineuploader

2015-09-04 16:39:57 +02:00

react_s3_fine_uploader_utils.js

First cut: Upload button for contract settings

2015-09-15 16:35:45 +02:00

react_s3_fine_uploader.js

Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract

2015-09-16 13:45:24 +02:00