Merge branch 'current' into next

Browse source

...

This commit is contained in:

Paulus Schoutsen 2017-05-04 21:49:24 -07:00

parent 57701f81cc 245d4280b8

commit 0ac6fd0f3f

103 changed files with 1628 additions and 744 deletions

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

Download patch file Download diff file Expand all files Collapse all files

BIN

source/images/blog/2017-05-hassbian-pi-zero/home_assistant_plus_rpi_600x315.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

source/images/hassio/architecture.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 11 KiB

BIN

source/images/screenshots/ecobee-thermostat-card.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 50 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

source/images/supported_brands/apiai.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3 KiB After Width:  |  Height:  |  Size: 13 KiB