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

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-17 16:25:38 -03:00
commit cd71ce4421
25 changed files with 268 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

1
index.html
View file

@ -852,6 +852,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
<script src="js/services/controllerUtils.js"></script>
<script src="js/services/passphrase.js"></script>
<script src="js/services/notifications.js"></script>
<script src="js/services/backupService.js"></script>
<script src="js/controllers/header.js"></script>
<script src="js/controllers/footer.js"></script>