Merge branch 'dev-shtcx-support' of https://github.com/valordk/esphome into dev-shtcx-support

Browse Source

# Conflicts:
#	esphome/components/shtcx/shtcx.cpp

...

This commit is contained in:

valordk 2019-07-28 16:28:08 +02:00

parent 1050feb482 851a4fdf26

commit a3925d7bb1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available