Skip to content
Snippets Groups Projects
Commit f0f716ef authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Merge remote-tracking branch 'origin/with-ES-store'

Conflicts:
	bower.json
	www/css/style.css
	www/i18n/locale-en.json
	www/index.html
	www/js/app.js
	www/js/controllers/currency-controllers.js
	www/js/controllers/home-controllers.js
	www/js/controllers/wallet-controllers.js
	www/js/services/crypto-services.js
	www/js/services/utils-services.js
	www/js/services/wallet-services.js
	www/templates/account/new_account.html
	www/templates/account/view_transfer.html
	www/templates/account/view_wallet.html
	www/templates/currency/select_currency.html
	www/templates/currency/tabs/view_parameters.html
	www/templates/currency/view_peer.html
	www/templates/explore/explore_currency.html
	www/templates/explore/explore_tabs.html
	www/templates/home.html
	www/templates/login.html
	www/templates/menu.html
	www/templates/wot/lookup.html
	www/templates/wot/modal_lookup.html
parents c4b79f9b 665b9114
No related branches found
No related tags found
Loading
Showing
with 276 additions and 29 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment