Merge branch 'dev_6078'
# Conflicts: # app/build.gradle

# Conflicts: # app/build.gradle
2024-10-21 12:18:12 +02:00 · 2024-09-10 07:19:28 +02:00 · 2024-10-21 12:18:12 +02:00 · 2024-07-01 11:48:41 +02:00 · 2023-01-19 16:24:43 +01:00 · 2024-02-29 09:19:16 +01:00
diff --git a/Sergio De la torre b/Sergio De la torre
Sergio De la torre bdbe219549 Merge branch 'dev_6078' # Conflicts: # app/build.gradle		2024-10-21 12:18:12 +02:00
.idea	feat: refactorResponse refs #7827	2024-09-10 07:19:28 +02:00
app	Merge branch 'dev_6078'	2024-10-21 12:18:12 +02:00
gradle/wrapper	feat issues refs #7636	2024-07-01 11:48:41 +02:00
mylibrary/build	Version 23.2-Fallos precontrol-Directo Ubicador desde histórico-Inventario no se cierra-Botón solo Agregar	2023-01-19 16:24:43 +01:00
.gitignore	modify gitIgnore	2024-02-29 09:19:16 +01:00
README.md	Initial commit	2021-07-05 07:43:59 +02:00
build.gradle	feat issues refs #7636	2024-08-12 12:32:39 +02:00
gradle.properties	feat issues refs #7636	2024-07-01 11:48:47 +02:00
gradlew	first commit	2020-05-04 13:15:24 +02:00
gradlew.bat	first commit	2020-05-04 13:15:24 +02:00
local.properties	Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking,	2022-11-02 11:37:55 +01:00
settings.gradle	first commit	2020-05-04 13:15:24 +02:00