Mario Colque 8325c2b02a fix conflicts		2014-05-13 14:29:17 -03:00
..
controllers	fix conflicts	2014-05-13 14:29:17 -03:00
models	Fixed autorefresh transactions proposal with a 1-1 wallet	2014-05-13 12:37:10 -03:00
services	fixes recommended by Matias	2014-05-13 11:27:31 -03:00
app.js	added the settings page	2014-05-13 14:19:37 -03:00
directives.js	fix avatar directive bug	2014-05-08 16:31:08 -03:00
filters.js
init.js
routes.js	fix conflicts	2014-05-13 14:29:17 -03:00