diminator fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js		2015-07-09 14:54:11 +01:00
..
vendor	Removed submodule react-s3	2015-06-23 10:16:53 +02:00
file_drag_and_drop_dialog.js	adjust register piece form	2015-07-07 18:07:12 +02:00
file_drag_and_drop_preview_image.js	translated english text to french	2015-07-08 09:57:50 +02:00
file_drag_and_drop_preview_iterator.js	add editable acl to react s3 fineuploader	2015-07-01 12:13:05 +02:00
file_drag_and_drop_preview_other.js	translated english text to french	2015-07-08 09:57:50 +02:00
file_drag_and_drop_preview.js	translated english text to french	2015-07-08 09:57:50 +02:00
file_drag_and_drop.js	some minor corrections	2015-07-08 10:15:58 +02:00
react_s3_fine_uploader.js	Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-	2015-07-09 14:54:11 +01:00