Tim Daubenschütz da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to- ... Cleared all conflicts Conflicts: js/components/ascribe_forms/form.js js/components/ascribe_forms/input_fineuploader.js js/components/ascribe_uploader/react_s3_fine_uploader.js js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/utils/requests.js		2015-11-16 15:27:00 +01:00
..
ascribe_file_drag_and_drop	Remove ReactS3FineUploader's dependency on react-router's location	2015-10-30 17:43:20 +01:00
ascribe_upload_button	Include feedback from PR	2015-11-13 09:48:22 +01:00
vendor	Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways	2015-11-03 10:21:43 +01: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 branch 'master' into AD-1264-refactor-reacts3fineuploader-to-	2015-11-16 15:27:00 +01:00