descomentando envio de correo
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SINE
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SINE
Merge branch 'dev'
Release 1.2.5
un cambio poco etico, pero necesario
regresando cambio
cambios
Release 1.2.5.1
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SINE
comentando
main
conexion bd prod
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINE into dev
Release 1.2.6
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINE into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINE into dev
conflict
auto db
fix auto db