Philoul 654ca35dd1 Merge branch 'UserEntryImprovement' into AdrianVWU_Update ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt # app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt # core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt # core/src/main/java/info/nightscout/androidaps/utils/Translator.kt # core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt # database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt		2021-03-28 17:04:52 +02:00
..
schemas/info.nightscout.androidaps.database.AppDatabase	food -> Room	2021-03-19 18:49:34 +01:00
src/main	Merge branch 'UserEntryImprovement' into AdrianVWU_Update	2021-03-28 17:04:52 +02:00
.gitignore	database module	2021-02-04 18:22:58 +01:00
build.gradle	sealed class serialisation	2021-03-27 21:14:56 +01:00
consumer-rules.pro	database module	2021-02-04 18:22:58 +01:00
proguard-rules.pro	database module	2021-02-04 18:22:58 +01:00