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
..
MyPreferenceFragment.kt	fix NPE and Target fragment must implement TargetFragment interface issue	2021-01-20 15:07:01 +01:00
PreferencesActivity.kt	PreferencesActivity -> jetpack	2021-01-22 14:04:32 +01:00
ProfileHelperActivity.kt	exclude dots from profile name	2021-03-02 23:22:15 +01:00
RequestDexcomPermissionActivity.kt	asking for permissions refactor	2021-01-18 22:47:55 +01:00
SingleFragmentActivity.kt	refactor import/export to create DaggerAppCompatActivityWithResult	2021-01-18 17:36:18 +01:00
StatsActivity.kt	Update uel.log entries, Increase database version 3=>4, update migration3to4	2021-02-28 15:54:37 +01:00
SurveyActivity.kt	SurveyActivity -> jetpack	2021-01-22 14:23:49 +01:00