AndroidAPS/app/src/main/java
Johannes Mockenhaupt e6eee42081
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  recategorize cp icons
  removed unnecessary text colour and fixed indentation
  layout indentation
  Moving some buttons to the right categories
  removed empty ghost files
  remove duplicate IDs and indentation fix
  Picture renaming (#311)
2017-07-24 02:25:28 +02:00
..
de/jotomo/ruffyscripter Comment on English being the only supported pump language so far. 2017-07-24 02:24:48 +02:00
info/nightscout Merge remote-tracking branch 'origin/dev' into combo 2017-07-24 02:25:28 +02:00
org/monkey/d/ruffy/ruffy/driver/display Source ruffy scripter for the time being (already some fixes and tweaks in). 2017-07-18 20:55:44 +02:00