commit por merge fix
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
version 1.1.5
Version 1.1.6
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
cambios de formatos en evolucion
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
Cambio en formato de fecha de evolucion
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
Haciendo pull por correo nuevo
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
CAmbios en maillista
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
Release v1.2.0-beta
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
resolviendo conflictos en servidor
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
resolviendo conflictos
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
Merge branch 'hotfix-1.2.3'
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
Merge branch 'dev'
Preparando puesta en produccion
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC
Merge branch 'dev'
correccion de errores
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_RENOC