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
..
prize	Include feedback from PR	2015-11-13 09:48:22 +01:00
wallet	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
index.scss	sluice styling	2015-10-14 12:12:06 +02:00