Login + Session activada
conflicto con login solucionado
Merge branch 'vistas' of https://github.com/dian42/GCadmin into vistas
Merge branch 'controler' into vistas
inicio de slidevar
Parte lógica de registroPropiedad by ilMachine (H)
Merge branch 'vistas' of https://github.com/dian42/GCadmin into vistas
Merge branch 'vistas' of https://github.com/dian42/GCadmin into vistas
Merge branch 'controler' of https://github.com/dian42/GCadmin into controler
Merge branch 'vistas' of https://github.com/dian42/GCadmin into controler