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
..
libs	Add prefernces.json validator lib	2017-01-29 13:00:21 +01:00
src	Merge branch 'develop' into 'mainline'	2017-08-06 22:35:07 +00:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Revert merge which was committed due to a misunderstanding.	2017-08-06 21:47:17 +02: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