Upstream/esphome-docs
1
0
Fork 0
mirror of https://github.com/esphome/esphome-docs.git synced 2025-01-13 20:11:53 +01:00
Code Issues Projects Releases Wiki Activity
6ecc76ba80
esphome-docs/esphomeyaml
History
Otto Winter 6ecc76ba80
Merge branch 'current' into next 
# Conflicts:
#	Makefile
#	esphomeyaml/changelog/v1.10.0.rst
#	esphomeyaml/devices/sonoff_basic.rst
#	esphomeyaml/index.rst
2019-02-07 18:22:22 +01:00
..
changelog Merge branch 'current' into next 2019-02-07 18:22:22 +01:00
devices Merge branch 'current' into next 2019-02-07 18:22:22 +01:00
index.rst Merge branch 'current' into next 2019-02-07 18:22:22 +01:00