AndroidAPS/app
Johannes Mockenhaupt 612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
2018-03-17 16:45:08 +01:00
..
libs Updated SightParser library 2018-03-10 21:25:14 +01:00
src Merge remote-tracking branch 'origin/dev' into combo-dev-merge 2018-03-17 16:45:08 +01:00
.gitignore Objectives design 2016-06-04 17:28:05 +02:00
build.gradle travis 2nd try 2018-03-13 23:48:14 +01:00
fabric.properties add bg language 2016-07-05 20:28:23 +02:00
proguard-rules.pro plugins refactoring 2016-08-05 23:54:03 +02:00