Tim Daubenschütz fbbbd1de89 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract ... Fix merge conflicts Conflicts: js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js js/components/ascribe_uploader/react_s3_fine_uploader.js		2015-09-15 13:47:36 +02:00
..
ascribe_file_drag_and_drop	Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract	2015-09-15 13:47:36 +02:00
vendor	update fineuploader	2015-09-04 16:39:57 +02:00
react_s3_fine_uploader_utils.js	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +02:00
react_s3_fine_uploader.js	Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract	2015-09-15 13:47:36 +02:00