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
..
libs	remove crashing library	2021-02-13 19:19:14 +01:00
src	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
build.gradle	bump 2.8.2.1-dev-c	2021-03-01 23:39:34 +01:00
fabric.properties
google-services.json	Survey	2019-10-08 21:20:04 +02:00
proguard-rules.pro