Gustavo Cortez bc5c473752 Fix conflicts: ... index.html		2014-06-27 00:04:25 -03:00
..
controllers	Merge pull request #773 from maraoz/ui/unify-notifications	2014-06-26 23:27:56 -03:00
directives	More tests for amounts validation	2014-06-25 17:10:00 -03:00
filters	Test for the new filter	2014-06-26 16:38:09 -03:00
services	More tests for amounts validation	2014-06-25 17:10:00 -03:00