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
..
main	Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge	2021-04-04 13:51:53 +02:00