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
..
controllers	Fixes karma tests	2014-07-16 19:00:34 -03:00
directives	Fix Conflicts:	2014-07-28 12:28:07 -03:00
filters	Show addresses for other copayers	2014-07-22 16:13:11 -03:00
services	add tests	2014-07-03 11:13:59 -03:00