Gustavo Maximiliano Cortez b94f66f32e Fixed Conflicts: ... bower.json js/directives.js views/includes/sidebar.html		2014-08-01 11:12:35 -03:00
..
address-book.html	layout bugs	2014-07-25 15:41:34 -03:00
qr-address.html	Fixed Conflicts:	2014-08-01 11:12:35 -03:00