Ivan Socolsky 19a8733a9c resolved conflicts		2014-09-12 10:28:16 -03:00
..
controllers	settings: fix tests 6	2014-09-10 14:06:54 -07:00
directives	settings: fix send in livenet	2014-09-11 11:19:19 -07:00
filters	settings: fix angular test 1	2014-09-10 13:40:20 -07:00
services	resolved conflicts	2014-09-12 10:28:16 -03:00