Johannes Mockenhaupt 3b43e4d06a Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: RS enable BT before scanning BG viewer NSOffline remove from queue as well NS offline # Conflicts: # app/src/main/res/values/strings.xml		2017-12-20 20:21:12 +01:00
..
androidTest/java/info/nightscout/androidaps	Remove unused test class.	2017-08-28 00:57:47 +02:00
main	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-20 20:21:12 +01:00
test/java/info/nightscout/utils	parse more iso formats	2017-12-03 17:34:29 +01:00