anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-21 09:38:27 -04:00
commit 3f402fbd89
65 changed files with 391 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app-template/index.html
View file

@ -12,6 +12,14 @@
</head>
<body>
<!-- Workaround to prevent autofill -->
<div style="display: none;">
<input type="text"
id="PreventChromeAutocomplete"
name="PreventChromeAutocomplete"
autocomplete="address-level4" />
</div>
<ion-nav-view>
<incoming-data-menu></incoming-data-menu>
</ion-nav-view>