Xose Pérez 3c21dc3e78 Merge branch 'dev' into light ...

Conflicts:
	code/espurna/config/general.h
	code/espurna/config/hardware.h
	code/espurna/hardware.ino
	code/html/custom.css
	code/html/custom.js

2017-08-18 14:17:20 +02:00

2.8 KiB

Raw Blame History

View Raw