Philoul 3d9ef71045 Merge branch 'meallink' into meallink_ValueWithUnit ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt		2021-03-31 22:18:50 +02:00
..
schemas/info.nightscout.androidaps.database.AppDatabase	DeviceStatus	2021-03-31 21:54:49 +02:00
src/main	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-31 22:18:50 +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