Merge branch 'feature/asignar_privilegios' into develop
privilegios caal listos
privilegios caal
nuevo panel
fix error
nuevo template
horarios_caal
fixed
Merge branch 'feature/privilegios_caal' into develop
confirmacion
Merge branch 'feature/reacomodo'