cambio de branch
cambios
cambios de nuevo de interfaz
Merge branch 'master' into dev
git status
agregado imagenes nuevas
Update controlPanel.php

cambio para el icono de check verde
interfaz
conflictas resolved
cambios
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINCA into dev
cambio en scrolltop img
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINCA into dev
merge a 1.5.3
bd
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINCA into dev
probando nuevo css
cambios en css de formulario
conexion bd
Cambios en interfaz, elimindao vardump en clockpick
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINCA into dev
css changed