Merge branch 'SergioDev' into Desarrollo
# Conflicts (solo ficheros de datos): # .gitignore # assets/data/load/listaMatRes.json # assets/data/load/usuarios.json
Showing
with
1214 additions
and
9 deletions
AddReservaInstalacion.js
0 → 100644
Inicio.js
0 → 100644
Instalaciones.js
0 → 100644
assets/data/load/RangoHorarios.json
0 → 100644
assets/data/load/instalaciones.json
0 → 100644
assets/data/load/listaGuardias.json
0 → 100644
assets/data/load/materialesSis.json
0 → 100644
assets/data/load/reservasInstalaciones.json
0 → 100644
assets/img/icons/alert.png
0 → 100644
6.75 KB
95.8 KB
62.5 KB
66.7 KB
74.5 KB
assets/img/installations/sala_musica.jpg
0 → 100644
66.9 KB
assets/img/photoProfiles/default.png
0 → 100644
1.3 KB
assets/img/photoProfiles/profile.png
0 → 100644
50.2 KB
Please
register
or
sign in
to comment