assets/img/icons · abae4a5d1bfef55da1b0f111392b2bc025306555 · Fernando Moreno Jiménez / proyecto_TDDM · GitLab

Find file History

Merge branch 'SergioDev' into Desarrollo · abae4a5d

# Conflicts (solo ficheros de datos):
#	.gitignore
#	assets/data/load/listaMatRes.json
#	assets/data/load/usuarios.json

committed Jan 23, 2023

Name	Last commit	Last Update
..
IconoInicio.png		Loading commit data...
IconoInstalaciones.png		Loading commit data...
IconoMaterial.png		Loading commit data...
IconoPerfil.png		Loading commit data...
alert.png		Loading commit data...
editar.png		Loading commit data...
flecha.png		Loading commit data...
iconoAdd.png		Loading commit data...
iconoBorrarMaterial.png		Loading commit data...
iconoElim.png		Loading commit data...