diminator 9bfd50e3bc Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields ... Conflicts: js/components/signup_container.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js		2015-09-21 10:21:44 +02:00
..
prize	Finish styling for landing page	2015-09-18 13:46:15 +02:00
wallet	Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields	2015-09-21 10:21:44 +02:00