cf83d20e13
# Conflicts: # core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt # database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt |
||
---|---|---|
.. | ||
assets | ||
java/info/nightscout/androidaps | ||
res | ||
AndroidManifest.xml | ||
blueowl-web.png | ||
ic_launcher-web.png | ||
ic_launcher_round-web.png |