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
..
cyland_accordion_list	Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark	2015-11-20 17:59:26 +01:00
cyland_buttons	Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page	2015-10-15 11:55:44 +02:00
cyland_detail	Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-	2015-11-16 15:27:00 +01:00
cyland_forms	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
cyland_hero.js	Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity	2015-10-14 17:25:53 +02:00
cyland_landing.js	Fix Cyland landing page	2015-12-03 12:44:12 +01:00
cyland_piece_list.js	Merge branch 'AD-697-update-title-in-the-browser'	2015-10-20 15:06:41 +02:00
cyland_register_piece.js	Change loan form's startdate and enddate props to be camel case	2015-12-03 13:34:00 +01:00