Philoul 919a718a81 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java # core/src/main/java/info/nightscout/androidaps/utils/Translator.kt		2021-03-17 08:55:26 +01:00
..
libs	remove crashing library	2021-02-13 19:19:14 +01:00
src	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-17 08:55:26 +01:00
build.gradle	Careportal -> Room	2021-03-08 20:10:02 +01:00
fabric.properties
google-services.json	Survey	2019-10-08 21:20:04 +02:00
proguard-rules.pro