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	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