Johannes Mockenhaupt fa1c282699 Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (28 commits) Singleton & Crashlytics logging part 2 treatments in config builder Singleton & Crashlytics logging part 1 checkboxes for NS-Client layouts overview checkboxes cutoff fix update NP value after manual entry restore preferences temp target presets Rv2 percent fix korean percent fix serialize reload of treatments getTempBasalFromHistory -> getRealTempBasalFromHistory Do not misinterpret a fake-extended as 0% temp. In one line Update danar_fragment.xml text identation Add files via upload Add files via upload Add files via upload Add files via upload ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java		2017-10-07 21:33:22 +02:00
..
libs	Add prefernces.json validator lib	2017-01-29 13:00:21 +01:00
src	Merge remote-tracking branch 'origin/dev' into smb	2017-10-07 21:33:22 +02:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Merge remote-tracking branch 'origin/dev' into smb	2017-10-07 21:33:22 +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