Tim Daubenschütz f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity ... Conflicts: js/components/ascribe_accordion_list/accordion_list_item_piece.js js/components/ascribe_app.js js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js js/components/logout_container.js js/components/whitelabel/wallet/wallet_app.js		2015-10-19 10:30:14 +02:00
..
file_drag_and_drop_dialog.js	Merged in AD-727-missing-redirects-to-login-page (pull request #95)	2015-10-19 10:13:54 +02:00
file_drag_and_drop_preview_image.js	spinners part2	2015-10-14 16:17:10 +02:00
file_drag_and_drop_preview_iterator.js	Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract	2015-09-15 13:47:36 +02:00
file_drag_and_drop_preview_other.js	spinners part2	2015-10-14 16:17:10 +02:00
file_drag_and_drop_preview_progress.js	minor getLangText edition	2015-09-16 15:23:01 +02:00
file_drag_and_drop_preview.js	minor corrections	2015-09-16 14:07:55 +02:00
file_drag_and_drop.js	Change links in app to new react-router@1.0rc1 syntax	2015-09-30 18:30:50 +02:00