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
..
dstHelper	PluginStore	2020-03-16 21:40:29 +01:00
objectives	Update uel.log entries, Increase database version 3=>4, update migration3to4	2021-02-28 15:54:37 +01:00
phoneChecker	code cleanup	2020-12-06 15:09:32 +01:00
safety	TemporaryTarget -> room database	2021-03-01 12:42:42 +01:00
signatureVerifier	update paths	2020-09-23 15:53:38 +02:00
storage	More tests	2020-03-19 20:03:44 +01:00
versionChecker	refactor import/export to create DaggerAppCompatActivityWithResult	2021-01-18 17:36:18 +01:00