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
..
schemas/info.nightscout.androidaps.database.AppDatabase	remove MealLink.class	2021-03-25 23:52:08 +01:00
src/main	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00
.gitignore	database module	2021-02-04 18:22:58 +01:00
build.gradle	sealed class serialisation	2021-03-27 21:14:56 +01:00
consumer-rules.pro	database module	2021-02-04 18:22:58 +01:00
proguard-rules.pro	database module	2021-02-04 18:22:58 +01:00