viktoria b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev' ... Conflicts: app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java app/src/main/res/values/strings.xml		2017-02-02 19:00:17 +01:00
..
libs	Add prefernces.json validator lib	2017-01-29 13:00:21 +01:00
src	Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'	2017-02-02 19:00:17 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'	2017-02-02 19:00:17 +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