Files · 84d111c27f687d886dda2cd85daf8f2da77e3230 · Fernando Moreno Jiménez / proyecto_TDDM · GitLab

Find file History

Merge remote-tracking branch 'origin/FernandoDev' into Desarrollo · 84d111c2
```
# Conflicts:
#	package-lock.json
#	package.json
```
Sergio Cubero León committed Jan 14, 2023
84d111c2 Browse Files

Name	Last commit	Last Update
assets		Loading commit data...
img		Loading commit data...
.DS_Store		Loading commit data...
.gitignore		Loading commit data...
App.js		Loading commit data...
BotonAdd.js		Loading commit data...
Contraseña.js		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		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...
inicio.json		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...