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
..
ascribe_file_drag_and_drop	Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity	2015-10-19 10:30:14 +02:00
ascribe_upload_button	minor corrections	2015-09-16 14:07:55 +02:00
vendor	update fineuploader	2015-09-04 16:39:57 +02:00
react_s3_fine_uploader_utils.js	First cut: Upload button for contract settings	2015-09-15 16:35:45 +02:00
react_s3_fine_uploader.js	Switch all usages of Router.Navigation and Router.State	2015-10-01 11:16:38 +02:00