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
..
libs	remove crashing library	2021-02-13 19:19:14 +01:00
src	Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge	2021-04-04 13:51:53 +02:00
build.gradle	DetailedBolusInfo, MealLink UI	2021-03-25 17:48:07 +01:00
fabric.properties
google-services.json	Survey	2019-10-08 21:20:04 +02:00
proguard-rules.pro