Johannes Mockenhaupt 0e61032dec Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml		2017-12-27 18:19:51 +01:00
..
activities	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00
Dialogs	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-27 18:19:51 +01:00
events	Localalerts settings by adrian	2017-11-28 21:48:46 +01:00
graphData	jelly overview	2017-12-03 13:55:54 +01:00
graphExtensions	fix of extended bolus size	2017-12-07 10:08:26 +02:00
notifications	Merge remote-tracking branch 'origin/dev' into csv2-staging	2017-12-25 20:29:32 +01:00
OverviewFragment.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-27 18:19:51 +01:00
OverviewPlugin.java	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00