Savek-CC d520643d45 Merge branch 'develop' into 'mainline' ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java		2017-08-06 22:35:07 +00:00
..
commands	Revert merge which was committed due to a misunderstanding.	2017-08-06 21:47:17 +02:00
History.java	Clean up commands package.	2017-07-18 21:20:40 +02:00
PumpCapabilities.java	determine max possible tbr firstshot	2017-07-26 18:11:45 +02:00
PumpState.java	battery and insulinstate	2017-07-27 12:20:59 +02:00
RuffyScripter.java	Merge branch 'develop' into 'mainline'	2017-08-06 22:35:07 +00:00