Tim Daubenschütz f42f4a02f8 Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading ... Resolve merge conflicts with master for easier PR. Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js		2015-09-14 11:14:02 +02:00
..
components	Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading	2015-09-14 11:14:02 +02:00
constants	add exception for loaning a piece for ikonotv	2015-08-28 12:20:36 +02:00
wallet_app.js	Create generic links in nav using routes	2015-08-25 16:33:26 +02:00
wallet_routes.js	remove header title	2015-09-09 17:27:23 +02:00