Tim Daubenschütz f78dbf9e1a Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings ... Conflicts: js/components/ascribe_forms/property.js		2015-09-14 14:23:36 +02:00
..
vendor	add more logs	2015-08-03 18:02:21 +02:00
file_drag_and_drop_dialog.js	fix wording for multiple uploads	2015-08-11 10:03:12 +02:00
file_drag_and_drop_preview_image.js	implement feedback for hashing functionalitxy	2015-07-23 17:05:52 +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	add getLangText for reactfineuploader	2015-07-23 17:17:48 +02:00
file_drag_and_drop_preview.js	add getLangText for reactfineuploader	2015-07-23 17:17:48 +02:00
file_drag_and_drop.js	Merge branch 'AD-435-hash-locally-for-when-a-artist-do'	2015-07-29 09:35:14 +02:00
react_s3_fine_uploader_utils.js	generic form submission determination for fineuploader	2015-09-01 14:42:09 +02:00
react_s3_fine_uploader.js	Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings	2015-09-14 14:23:36 +02:00