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
..
account_settings.js	Implement cache invalidation functionality for UserStore & UserSources	2015-11-02 11:31:02 +01:00
api_settings.js	replaced fonts	2015-10-12 15:25:21 +02:00
bitcoin_wallet_settings.js	replaced fonts	2015-10-12 15:25:21 +02:00
contract_settings_update_button.js	Generalize UploadButton styling	2015-11-17 11:22:24 +01:00
contract_settings.js	Add document title management for the ascribe app	2015-10-13 16:42:40 +02:00
settings_container.js	webhooks in settings without acl	2015-11-27 03:24:37 +01:00
webhook_settings.js	copy for webhooks	2015-11-27 18:02:25 +01:00