Philoul f3787304f8 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge ... # 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/FillDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt # app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt # app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt # database/schemas/info.nightscout.androidaps.database.AppDatabase/4.json		2021-03-09 21:50:17 +01:00
..
libs	remove crashing library	2021-02-13 19:19:14 +01:00
src	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge	2021-03-09 21:50:17 +01:00
build.gradle	Careportal -> Room	2021-03-08 20:10:02 +01:00
fabric.properties
google-services.json	Survey	2019-10-08 21:20:04 +02:00
proguard-rules.pro