AndroidAPS/app/src/main/java
Johannes Mockenhaupt 9459dfe321
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Remove dead code.
  Ctors Android-style.
  Fix NPE initialising MyPreferencesFragment.
  RS fix last bolus time
  RS remove duplicated message
  RS fix extended bolus result
  show timeshift if not zero
  CS translation
  removed unneeded code
  long click on name to open settings
  add link to advanced settings

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-11-18 17:46:20 +01:00
..
com Cleanup. 2017-10-26 17:35:46 +02:00
info/nightscout Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-11-18 17:46:20 +01:00