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
..
main	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00
test/java/info/nightscout/androidaps/plugins/general/automation	eliminate treatments cache from TreatmentsPlugin	2021-03-29 19:15:46 +02:00