Tim Daubenschütz da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to- ... Cleared all conflicts Conflicts: js/components/ascribe_forms/form.js js/components/ascribe_forms/input_fineuploader.js js/components/ascribe_uploader/react_s3_fine_uploader.js js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/utils/requests.js		2015-11-16 15:27:00 +01:00
..
detail_property.js
edition_action_panel.js
edition_container.js
edition.js
further_details_fileuploader.js
further_details.js
history_iterator.js
license_detail.js
media_container.js
note.js
piece_container.js
piece.js