Johannes Mockenhaupt 7d4d6374be Merge branch 'combo-strings' into combo-scripter-v2 ... * combo-strings: Add strings for the Combo pump, including some renames. # Conflicts: # app/src/main/res/values/strings.xml		2018-01-11 21:48:01 +01:00
..
androidTest/java/info/nightscout/androidaps	Remove unused test class.	2017-08-28 00:57:47 +02:00
main	Merge branch 'combo-strings' into combo-scripter-v2	2018-01-11 21:48:01 +01:00
test/java/info/nightscout/utils	more round tests	2018-01-10 23:57:02 +01:00