Carlos Jimenez f7cac19be4 merge conflict		2018-03-21 15:56:20 +01:00
..
common	merge conflict	2018-03-21 15:56:20 +01:00
server	update fixtures for bi.rotacion and add mobel annualAverageInvoiced	2018-03-20 15:01:49 +01:00
Dockerfile	create services ticket, fixtures and models for salix 1.7.0	2018-03-12 13:55:18 +01:00
package.json	create services ticket, fixtures and models for salix 1.7.0	2018-03-12 13:55:18 +01:00