cf83d20e13
# Conflicts: # core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt # database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
fabric.properties | ||
google-services.json | ||
proguard-rules.pro |