Milos Kozak e5cc34b975 fix merge conflict		2017-08-16 18:38:14 +02:00
..
assets	initial work on SMB	2017-08-15 23:13:37 +02:00
java/info/nightscout	fix merge conflict	2017-08-16 18:38:14 +02:00
res	fix merge conflict	2017-08-16 18:38:14 +02:00
AndroidManifest.xml	nsclient ackAlarm local	2017-07-24 02:33:29 +02:00