Milos Kozak ca3d94a8ca fix merge conflict		2017-08-17 21:21:38 +02:00
..
assets	Logging: Print filename and line instead of logger name.	2017-08-13 21:31:21 +02:00
java/info/nightscout	fix merge conflict	2017-08-17 21:21:38 +02:00
res	fix merge conflict	2017-08-17 21:21:38 +02:00
AndroidManifest.xml	nsclient ackAlarm local	2017-07-24 02:33:29 +02:00