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
..
src	Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML	2021-03-06 22:31:39 +01:00
.gitignore	core module	2020-05-03 21:27:42 +02:00
build.gradle	migrate rest of gradle module files	2021-02-18 23:35:23 +01:00
consumer-rules.pro	core module	2020-05-03 21:27:42 +02:00
core_dependencies.gradle	Merge remote-tracking branch 'upstream/dev' into dash	2021-02-20 18:48:06 +01:00
proguard-rules.pro	core module	2020-05-03 21:27:42 +02:00