diminator c24021302f Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity ... Conflicts: js/components/whitelabel/wallet/components/cyland/cyland_hero.js		2015-10-14 17:25:53 +02:00
..
components	Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity	2015-10-14 17:25:53 +02:00
constants	add user endpoint to cyland	2015-09-18 15:51:15 +02:00
wallet_app.js	cyland	2015-10-14 17:13:16 +02:00
wallet_routes.js	Rename whitelabel component director to ikonotv specific prefix	2015-10-13 11:39:33 +02:00