Johannes Mockenhaupt 9eefae4f67 Merge branch 'queue-bolus-constraints' into combo-scripter-v2 ... * queue-bolus-constraints: Apply bolus constraint before applying. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java		2017-12-18 21:06:31 +01:00
..
libs	first rhino	2017-10-15 02:52:57 +02:00
src	Merge branch 'queue-bolus-constraints' into combo-scripter-v2	2017-12-18 21:06:31 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Set version to 1.56-combo-csv2-test	2017-12-07 18:20:11 +01:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00