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
..
assets	update certs	2021-01-27 16:11:37 +01:00
java/info/nightscout/androidaps	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-17 08:55:26 +01:00
res	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-17 08:55:26 +01:00
AndroidManifest.xml	automation module	2021-02-22 17:22:30 +01:00
blueowl-web.png	icons & wear	2018-07-21 21:21:29 +02:00
ic_launcher-web.png	icons & wear	2018-07-21 21:21:29 +02:00
ic_launcher_round-web.png	icons & wear	2018-07-21 21:21:29 +02:00