Maxch26 aee306ac26 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/com/example/pantallacompra/MainActivity.kt		2024-03-18 14:34:02 -06:00
..
src	Merge remote-tracking branch 'origin/master'	2024-03-18 14:34:02 -06:00
.gitignore	Pantalla Compra (Luis)	2024-03-09 11:49:31 -06:00
build.gradle.kts	Ajustes en la Pantalla Compra	2024-03-18 14:20:19 -06:00
google-services.json	Hala Madrid	2024-03-11 23:11:30 -06:00
proguard-rules.pro	Pantalla Compra (Luis)	2024-03-09 11:49:31 -06:00