diminator 6013303bd6 Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra ... Conflicts: js/components/ascribe_buttons/button_submit_close.js js/components/ascribe_forms/form_loan.js js/components/ascribe_forms/form_register_piece.js sass/ascribe_media_player.scss sass/main.scss		2015-09-10 17:45:51 +02:00
..
components	Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-10 17:45:51 +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	terms and conditions page with accept/deny	2015-09-07 12:03:59 +02:00