Tim Daubenschütz e42df2bb36 Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh ...

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js

2015-11-16 16:23:23 +01:00

..

file_drag_and_drop_dialog.js

Remove ReactS3FineUploader's dependency on react-router's location

2015-10-30 17:43:20 +01:00

file_drag_and_drop_preview_image.js

spinners part2

2015-10-14 16:17:10 +02:00

file_drag_and_drop_preview_iterator.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

file_drag_and_drop_preview_other.js

spinners part2

2015-10-14 16:17:10 +02:00

file_drag_and_drop_preview_progress.js

minor getLangText edition

2015-09-16 15:23:01 +02:00

file_drag_and_drop_preview.js

minor corrections

2015-09-16 14:07:55 +02:00

file_drag_and_drop.js

Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh

2015-11-16 16:23:23 +01:00