Merge branch 'next'

Browse source

Conflicts:
	source/_components/binary_sensor.template.markdown

...

This commit is contained in:

Paulus Schoutsen 2016-06-07 19:31:21 -07:00

parent 004b35a129 1102f5ab3c

commit 0cc0369faa

18 changed files with 325 additions and 21 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/supported_brands/enocean.png Normal file

View file

Binary file not shown.

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

BIN

source/images/supported_brands/osramlightify.png Normal file

View file

Binary file not shown.

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