Philoul 22c1233201 Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt # app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt # app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt		2021-04-04 13:51:53 +02:00
..
src	Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge	2021-04-04 13:51:53 +02:00
.gitignore	combo -> new lib	2021-02-21 14:34:31 +01:00
build.gradle	PumpSync interface, VirtualPump, remove pump driver dependency to database	2021-03-29 00:31:40 +02:00
consumer-rules.pro	combo -> new lib	2021-02-21 14:34:31 +01:00
proguard-rules.pro	combo -> new lib	2021-02-21 14:34:31 +01:00