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
..
strings.xml	Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'	2017-02-02 19:00:17 +01:00