Philoul 4ce59b929a Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt # app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt		2021-03-03 22:49:31 +01:00
..
events	TemporaryTarget -> room database	2021-03-01 12:42:42 +01:00
fragments	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
CarbsGenerator.kt	cleanup	2021-02-14 15:09:06 +01:00
TreatmentService.java	fix tests and dependencies	2021-02-18 21:38:36 +01:00
TreatmentsFragment.kt	show TBR tab in engineering mode only	2021-03-02 23:32:30 +01:00
TreatmentsPlugin.java	fix tests	2021-03-01 17:22:12 +01:00