AndroidAPS/app/src/main/java/info/nightscout
Johannes Mockenhaupt d54b99c559
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Cleanup gradle build files
  Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
  Avoid race condition checking for an active TBR.
  Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).

# Conflicts:
#	app/build.gradle
2018-01-13 23:18:44 +01:00
..
androidaps Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-13 23:18:44 +01:00
utils QuickWizard detailed settings 2017-12-26 00:27:34 +01:00