Sergio De la torre 4c59d4cb10 Merge branch '4021_embalajes' into 4021-gestion_embalajes ... # Conflicts: # .idea/workspace.xml # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt # app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt # app/src/main/res/values-es/strings.xml # app/src/main/res/values/strings.xml		2023-06-06 10:46:56 +02:00
..
alpha/release	version alfa	2023-05-31 16:03:41 +02:00
beta	version 23.22.1	2023-06-06 09:55:07 +02:00
betatesting/release	version alfa	2023-05-31 16:03:41 +02:00
debug	Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)	2022-12-09 10:59:58 +01:00
release	version alfa	2023-05-31 16:03:41 +02:00
src	Merge branch '4021_embalajes' into 4021-gestion_embalajes	2023-06-06 10:46:56 +02:00
.gitignore	first commit	2020-05-04 13:15:24 +02:00
build.gradle	version 23.22.1	2023-06-06 09:55:07 +02:00
escenarios.txt	Versión 6.1.8.5 no lanzada.Con actualización libreria koin 2.1.6,cambiadas funciones deprecated,borrados resources que no se utilizaban, quitados databinding de layouts.	2021-10-22 10:58:14 +02:00
google-services.json	version alfa	2023-05-31 16:03:41 +02:00
proguard-rules.pro	first commit	2020-05-04 13:15:24 +02:00