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
..
androidaps	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-18 20:22:26 +01:00
utils	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-18 20:22:26 +01:00