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
..
account_settings.js	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
api_settings.js	refactor account settings into multiple files	2015-08-31 16:36:24 +02:00
bitcoin_wallet_settings.js	refactor account settings into multiple files	2015-08-31 16:36:24 +02:00
contract_settings_update_button.js	PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants	2015-09-16 15:14:08 +02:00
contract_settings.js	contract expandedDefault to false	2015-09-18 16:04:48 +02:00
settings_container.js	acl on contract settings	2015-09-18 09:46:37 +02:00