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
..
androidaps	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-27 18:19:51 +01:00
utils	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00