viktoria 678fbedcbf Merge branch 'dev' ... Conflicts: app/src/main/res/values/strings.xml		2017-01-18 03:03:58 +01:00
..
assets	copy basic files oref0 dev 2017/01/04, make it running without crash	2017-01-04 22:21:46 +01:00
java/info/nightscout	Merge branch 'dev'	2017-01-18 03:03:58 +01:00
res	Merge branch 'dev'	2017-01-18 03:03:58 +01:00
AndroidManifest.xml	Korean DanaR Stats Activity	2017-01-16 13:23:41 +01:00