Christian 64f21fcfaa Merge branch 'master' of http://157.245.125.231/QSoftTechnologies/werp-services		2020-09-03 09:49:54 -05:00
src	Cambios finales	2020-09-03 09:24:10 -05:00
target	merge problem	2020-09-03 09:49:50 -05:00
.gitignore	Merge remote-tracking branch 'cruales/cruales'	2020-08-04 10:58:28 -05:00
nb-configuration.xml	Algunos temas de farmaEnlace	2020-07-28 14:35:15 -05:00
nbactions.xml	Cambios para notificacion	2020-06-23 09:27:09 -05:00
pom.xml	Cambios para notificacion	2020-06-23 09:27:09 -05:00