Philoul cf83d20e13 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML ... # Conflicts: # core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt # database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt		2021-03-06 22:31:39 +01:00
..
java/info/nightscout/androidaps	Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML	2021-03-06 22:31:39 +01:00
res	xml export initialization	2021-03-06 16:14:44 +01:00
AndroidManifest.xml	fix grabbing SSID info	2020-07-02 22:45:47 +02:00