Philoul 6c8b4dfab0 Merge branch 'meallink' into meallink_ValueWithUnit ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt		2021-03-29 22:39:12 +02:00
..
java/info/nightscout/androidaps	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00
res	Add Source icon in UserEntryFragment, Update source in uel.log	2021-03-25 13:32:11 +01:00
AndroidManifest.xml	automation module	2021-02-22 17:22:30 +01:00