Johannes Mockenhaupt 3bd865a870 Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: 1.5e Let CircadianPercentageProfileFragment inherit from SubscriberFragment. Fix after merge-conflict cleanup Files renamed Added icons for home, actions and care portal screens update bg translation synchronize interval access from other classes remove unnecessary semicolons spanish emptiy string remove extra strings self asignment -> comment string comparison Add color of chart to corresponding lables/scale Update InsulinFastactingProlongedFragment.java Update InsulinFastactingFragment.java Extract SubscriberFragment base class. Have most fragments update their content in onResume.		2017-07-21 17:42:27 +02:00
..
libs	Add prefernces.json validator lib	2017-01-29 13:00:21 +01:00
src	Merge remote-tracking branch 'origin/dev' into combo	2017-07-21 17:42:27 +02:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Merge remote-tracking branch 'origin/dev' into combo	2017-07-21 17:42:27 +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