Merge branch 'master' of github.com:juanito16/sistema_control_salitas_v1
Merge branch 'master' of github.com:juanito16/sistema_control_salitas_v1
modificando controles de formulario agregar reservacion a salitas
otra modificasion
Merge branch 'admin_salitas'