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
..
main	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft	2021-03-01 08:34:40 +01:00
test/java/info/nightscout/androidaps	Dana module test & lints	2021-02-19 10:29:35 +01:00