rljonesau dc8e1940f2 Merged remote-tracking branch 'remotes/origin/ESP32HTTP' ... Conflict resolved in Arduino/BTCDieselHeater/BTCDieselHeater.ino		2018-11-07 19:56:47 +11:00
..
BTCDieselHeater	Merged remote-tracking branch 'remotes/origin/ESP32HTTP'	2018-11-07 19:56:47 +11:00
Libraries	Merged branch 'master' into ESP32OTA to acquire ClassyBluetooth changes	2018-11-06 13:25:05 +11:00