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
..
src	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00
.gitignore	automation module	2021-02-22 17:22:30 +01:00
build.gradle	automation module	2021-02-22 17:22:30 +01:00
consumer-rules.pro	automation module	2021-02-22 17:22:30 +01:00
proguard-rules.pro	automation module	2021-02-22 17:22:30 +01:00