ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
1,270 Commits 115 Branches 0 Tags 13 MiB
fbbbd1de89
Commit Graph

3 Commits

Author SHA1 Message Date
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
Tim Daubenschütz
6c8135d6ac fix length of undefined bug in fineuploadeer 2015-09-15 13:13:58 +02:00
Tim Daubenschütz
c08f46bd69 separate FileDragAndDrop component 2015-09-15 11:13:17 +02:00