Tim Daubenschütz 76cf9fd74d Merge branch 'AD-435-hash-locally-for-when-a-artist-do' ... Conflicts: js/components/ascribe_forms/form_register_piece.js js/components/ascribe_slides_container/slides_container.js js/components/ascribe_uploader/file_drag_and_drop.js js/components/ascribe_uploader/react_s3_fine_uploader.js		2015-07-29 09:35:14 +02:00
..
slides_container.js	Merge branch 'AD-435-hash-locally-for-when-a-artist-do'	2015-07-29 09:35:14 +02:00