Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Clear some merge conflicts and also some wrong merges. BAD GIT!!! Conflicts: js/components/ascribe_forms/property.js js/components/ascribe_uploader/react_s3_fine_uploader_utils.js sass/ascribe_uploader.scss		2015-09-15 13:30:24 +02:00
..
components	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +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