John-Michael Baier 60a138a045 Merge remote-tracking branch 'origin/master' into enhanced_device ...

# Conflicts:
#	src/lib/ebus/device.cpp
#	src/lib/ebus/device.h

2020-05-09 09:19:30 +02:00

..

ebus

Merge remote-tracking branch 'origin/master' into enhanced_device

2020-05-09 09:19:30 +02:00

utils

don't require logging if log file is not set

2020-04-11 13:26:10 +02:00