Commit Graph

152 Commits

Author SHA1 Message Date
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
Otto Winter 8d9b0d2375
Netlify (#153)
* Netlify

* Fix

* Faster doxygen

* Update Makefile

* Try without api

* Debug

* Fix

* Update Makefile

* Debug

* Try 1.8.13

* Remove debug

* Update Makefile

* Optimize
2019-02-07 13:54:45 +01:00