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
..
piece_list_toolbar_filter_widget.js
piece_list_toolbar_order_widget.js
piece_list_toolbar.js	Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity	2015-10-19 10:30:14 +02:00