Philoul 2ae4cc3c03 Merge remote-tracking branch 'Nightscout/dev' into New/AddCorrPercentInWizard ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt		2021-12-11 02:33:41 +01:00
..
info/nightscout/androidaps	Merge remote-tracking branch 'Nightscout/dev' into New/AddCorrPercentInWizard	2021-12-11 02:33:41 +01:00