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
..
assets	update certs	2021-01-27 16:11:37 +01:00
java/info/nightscout/androidaps	Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge	2021-04-04 13:51:53 +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	automation module	2021-02-22 17:22:30 +01:00
blueowl-web.png	icons & wear	2018-07-21 21:21:29 +02:00
ic_launcher-web.png	icons & wear	2018-07-21 21:21:29 +02:00
ic_launcher_round-web.png	icons & wear	2018-07-21 21:21:29 +02:00