Paulus Schoutsen 4abbbf0f50 Merge remote-tracking branch 'origin/master' into dev ...

Conflicts:
	homeassistant/bootstrap.py
	homeassistant/components/frontend/version.py
	homeassistant/const.py

2016-04-19 22:53:26 -07:00

..

www_static

Merge remote-tracking branch 'origin/master' into dev

2016-04-19 22:53:26 -07:00

__init__.py

Make sure we always sent content-length header

2016-03-27 12:15:41 -07:00

index.html.template

Add template editor

2015-12-17 23:33:09 -08:00

mdi_version.py

Update frontend

2016-04-19 21:39:44 -07:00

version.py

Merge remote-tracking branch 'origin/master' into dev

2016-04-19 22:53:26 -07:00