Tim Daubenschütz 49421e1fa1 Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form ... Conflicts: js/components/ascribe_detail/further_details_fileuploader.js js/components/ascribe_forms/form.js js/components/ascribe_forms/form_loan.js js/components/ascribe_forms/form_register_piece.js js/components/ascribe_forms/input_fineuploader.js js/components/ascribe_forms/property.js js/components/ascribe_forms/property_collapsible.js js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js js/components/ascribe_uploader/react_s3_fine_uploader.js js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js sass/ascribe-fonts/ascribe-fonts.scss sass/whitelabel/wallet/cyland/cyland_custom_style.scss		2015-12-07 13:39:30 +01:00
..
acls	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark	2015-11-24 10:42:15 +01:00
acl_button_list.js	Fix bug in FB button component & simplify injectHead util	2015-11-23 19:02:28 +01:00
acl_information.js	Change instances of "Share" to be "Email"	2015-11-10 11:53:05 +01:00
create_editions_button.js	Fix buttons for cc	2015-10-21 14:52:25 +02:00
delete_button.js	Add tertiary button style	2015-10-27 17:15:23 +01:00
form_submit_button.js	Fix detachment of DOM <-> browser state	2015-11-23 13:59:07 +01:00
unconsign_request_button.js	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00