Johannes Mockenhaupt d0f876659e Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Ensure basal rate shown as a percentage if required according to user preferences. Show watch basal rates, whether temporary or normal.		2017-12-28 00:15:05 +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-28 00:15:05 +01:00
test/java/info/nightscout/utils	fix doubled percentage when comming from NS	2017-12-22 21:03:36 +01:00