Find a file
Johannes Mockenhaupt 8e68a23225
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-18 20:22:26 +01:00
app Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-18 20:22:26 +01:00
gradle/wrapper gradle update 2017-12-03 18:29:57 +01:00
ruffy-spi Minor fixes and polish around bolus cancellation. 2017-12-15 10:41:07 +01:00
ruffyscripter Merge pull request #24 from jotomo/cleanups 2017-12-17 21:23:02 +01:00
wear Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01:00
.gitignore fix gitignore 2017-02-11 01:50:25 +01:00
.travis.yml fix build tools for travis 2017-12-03 21:36:24 +01:00
build.gradle try to fix travis 2017-12-03 21:31:06 +01:00
gradle.properties Objectives design 2016-06-04 17:28:05 +02:00
gradlew permission access for travis 2016-12-28 16:10:06 +01:00
gradlew.bat Objectives design 2016-06-04 17:28:05 +02:00
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README-Combo.md README updates. 2017-12-17 15:38:33 +01:00
README.md Travis badge 2016-12-29 14:13:04 +01:00
settings.gradle Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +02:00
Testing-Combo.md Clean up Testing-Combo.md a bit. 2017-12-17 16:56:52 +01:00
TODO-Combo.md Update docs. 2017-12-06 20:27:36 +01:00

AndroidAPS

Gitter Build status