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
..
nightscout	Merge branch 'queue-bolus-constraints' into combo-scripter-v2	2017-12-18 21:06:31 +01:00