Gustavo Maximiliano Cortez 85aa5842f1 Fix Conflicts: ... .gitignore index.html js/controllers/backup.js js/controllers/sidebar.js		2014-07-28 12:28:07 -03:00
..
backupService.js	Send email backup with file attached	2014-07-25 11:30:54 -03:00
controllerUtils.js	Fix Conflicts:	2014-07-28 12:28:07 -03:00
isMobile.js
notifications.js	Fix Conflicts:	2014-07-28 12:28:07 -03:00
passphrase.js
socket.js
uriHandler.js
video.js
walletFactory.js