Philoul 6c8b4dfab0 Merge branch 'meallink' into meallink_ValueWithUnit ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt		2021-03-29 22:39:12 +02:00
..
java/info/nightscout/androidaps	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00
res	Remove UserEntryExt file and move UserEntryPresentationHelper.kt in utils folder	2021-03-28 18:52:13 +02:00
AndroidManifest.xml	fix grabbing SSID info	2020-07-02 22:45:47 +02:00