Gustavo Maximiliano Cortez a3baab397c Fix Conflicts: ... css/main.css views/modals/qr-address.html		2014-08-01 13:14:10 -03:00
..
controllers	Merge pull request #976 from cmgustavo/feature/01-timeout	2014-08-01 10:56:23 -03:00
models	Add a pre-generated address to the shared branch	2014-07-31 16:13:27 -03:00
services	Merge pull request #998 from yemel/fix/browser-extensions	2014-08-01 11:54:41 -03:00
app.js	feature: Logout wallet after 15 minutes of inactivity	2014-07-30 20:12:22 -03:00
directives.js	Fixed Conflicts:	2014-08-01 11:12:35 -03:00
filters.js	Show addresses for other copayers	2014-07-22 16:13:11 -03:00
init.js	change angular module namespace to copayApp	2014-06-03 17:48:37 -03:00
mobile.js	Update chrome extension	2014-08-01 10:03:11 -03:00
routes.js	Fix Karma test	2014-07-31 22:49:11 -03:00
shell.js	we still need node integration, so fix moment loader another way	2014-07-07 15:53:42 -04:00