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
..
aidl/org/monkey/d/ruffy/ruffy/driver	combo -> new lib	2021-02-21 14:34:31 +01:00
java	prepare TemporaryBasal	2021-04-01 23:46:21 +02:00
res	Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump)	2021-04-03 18:51:36 +02:00
AndroidManifest.xml	combo -> new lib	2021-02-21 14:34:31 +01:00