Milos Kozak 39c6ae5eae fix merge conflict		2017-06-30 09:35:20 +02:00
..
assets	report autosens to NS	2017-05-01 14:28:45 +02:00
java/info/nightscout	fix merge conflict	2017-06-30 09:35:20 +02:00
res	fix merge conflict	2017-06-30 09:35:20 +02:00
AndroidManifest.xml	simplify danar activities, fix profiles	2017-06-12 23:31:50 +02:00