esphome-docs/esphomeyaml
Otto Winter 834b27b4fc
Merge branch 'current' into next
# Conflicts:
#	esphomeyaml/changelog/index.rst
2019-01-06 10:20:10 +01:00
..
changelog Merge branch 'current' into next 2019-01-06 10:20:10 +01:00
components Merge branch 'current' into next 2019-01-06 10:20:10 +01:00
cookbook Fixed typo in Sonoff R2 Cover example (#112) 2018-12-27 20:21:35 +01:00
devices Add pins for Shelly 2 (#103) 2018-12-15 11:09:56 +01:00
guides Merge branch 'current' into next 2019-01-06 10:20:10 +01:00
images Documentation for MAX31855 sensor (#97) 2018-12-19 13:21:44 +01:00
index.rst Merge branch 'current' into next 2019-01-06 10:20:10 +01:00