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
..
aps	Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge	2021-04-04 13:51:53 +02:00
configBuilder	Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions	2021-04-03 12:25:44 +02:00
constraints	pair programming session	2021-04-03 21:29:26 +02:00
general	Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge	2021-04-04 13:51:53 +02:00
insulin	Treatment cleanup	2021-04-01 18:14:31 +02:00
iob/iobCobCalculator	carbs with duration	2021-03-30 22:05:44 +02:00
profile	pair programming session	2021-04-03 21:29:26 +02:00
pump	prepare TemporaryBasal	2021-04-01 23:46:21 +02:00
sensitivity	Remove Tratment.class where possible	2021-03-30 19:37:26 +02:00
source	pair programming session	2021-04-03 21:29:26 +02:00
treatments	pair programming session	2021-04-03 21:29:26 +02:00