Philoul df995724a7 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft ... # Conflicts: # automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt		2021-03-01 08:34:40 +01:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft	2021-03-01 08:34:40 +01:00
.gitignore	dana module	2020-05-09 20:18:12 +02:00
build.gradle	Switched to Enum class for UserEntryLogger	2021-02-21 00:28:44 +01:00
consumer-rules.pro	dana module	2020-05-09 20:18:12 +02:00
proguard-rules.pro	dana module	2020-05-09 20:18:12 +02:00