Johannes Mockenhaupt 8e68a23225 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: G5 upload to xdrip fake Esel new file fake Esel Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications # Conflicts: # app/src/main/res/values/strings.xml		2017-12-18 20:22:26 +01:00
..
activities	Generify MainApp.getSpecificPlugin.	2017-08-22 13:47:02 +02:00
Dialogs	Clean up earlier merge blunder.	2017-12-06 12:12:25 +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 combo-scripter-v2	2017-12-18 20:22:26 +01:00
OverviewFragment.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-09 19:51:07 +01:00
OverviewPlugin.java	Localalerts settings by adrian	2017-11-28 21:48:46 +01:00
QuickWizard.java	Log exceptions in catch blocks rather than printing to console.	2017-09-09 16:41:06 +02:00