britea 501b9219b9 resolve conflict		2020-05-08 10:03:31 +02:00
..
java/ch/usi/inf/sa4/sanmarinoes/smarthut	resolve conflict	2020-05-08 10:03:31 +02:00
resources	fix update sensor	2020-04-25 16:33:00 +02:00