Tim Daubenschütz fad6caca63 Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity ... Conflicts: js/components/ascribe_detail/edition_container.js js/components/logout_container.js		2015-10-21 09:47:14 +02:00
..
file_drag_and_drop_dialog.js
file_drag_and_drop_preview_image.js
file_drag_and_drop_preview_iterator.js
file_drag_and_drop_preview_other.js
file_drag_and_drop_preview_progress.js
file_drag_and_drop_preview.js
file_drag_and_drop.js	Merged in AD-947-fileuploader-button-does-not-work (pull request #100)	2015-10-19 14:53:02 +02:00