Files · Desarrollo · 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
assets		Loading commit data...
.DS_Store		Loading commit data...
.gitignore		Loading commit data...
AddReservaInstalacion.js		Loading commit data...
App.js		Loading commit data...
BotonAdd.js		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
Inicio.js		Loading commit data...
Instalaciones.js		Loading commit data...
Navegacion.js		Loading commit data...
Password.js		Loading commit data...
Perfil.js		Loading commit data...
README.md		Loading commit data...
TabBar.js		Loading commit data...
app.json		Loading commit data...
babel.config.js		Loading commit data...
index.js		Loading commit data...
listaMatRes.js		Loading commit data...
materialesLista.js		Loading commit data...
metro.config.js		Loading commit data...
package-lock.json		Loading commit data...
package.json		Loading commit data...
yarn.lock		Loading commit data...