Gerardo 4ef8273433 Merge branch 'Elena/reco' into Gerardo/AñadirPinvoke ... # Conflicts: # Model/OliviaGlob.cs # OliviaAddInPro.csproj # ViewModel/Limpieza/PaneLimpiezaViewModel.cs		2022-01-27 22:35:10 +01:00
..
CheckedListItem.cs	Avances ventana limpieza	2021-07-28 15:56:07 +02:00
EnabledComboBoxItem.cs	Avances ventana Recogida	2021-11-28 12:44:08 +01:00
HelperGdb.cs	Merge branch 'Elena/reco' into Gerardo/AñadirPinvoke	2022-01-27 22:35:10 +01:00
HelperGlobal.cs	Importacion estable	2021-11-14 17:08:06 +01:00