Milos Kozak ef645ca600 fix merge conflict		2017-10-07 18:27:20 +02:00
..
androidTest/java/info/nightscout/androidaps	Objectives design	2016-06-04 17:28:05 +02:00
main	fix merge conflict	2017-10-07 18:27:20 +02:00
test/java/info/nightscout/utils	Revert "Rounding issues visible in nightscout insulin field"	2017-09-18 21:24:22 +02:00