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
..
account_settings.js	replaced fonts	2015-10-12 15:25:21 +02:00
api_settings.js	replaced fonts	2015-10-12 15:25:21 +02:00
bitcoin_wallet_settings.js	replaced fonts	2015-10-12 15:25:21 +02:00
contract_settings_update_button.js	Change links in app to new react-router@1.0rc1 syntax	2015-09-30 18:30:50 +02:00
contract_settings.js	Refactor of wallet app routing	2015-10-01 15:57:46 +02:00
settings_container.js	Remove all unneccessary react-router imports	2015-10-01 14:36:56 +02:00