Johannes Mockenhaupt 2861509d07 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. BolusProgressDialog: hide stop button once pressed. fix RU translation use MIN_DIA instead of DEFAULT_DIA		2017-11-22 10:56:57 +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-11-22 10:56:57 +01:00
test/java/info/nightscout/utils	fix format and add test for fromISODateString	2017-11-20 13:34:13 +01:00