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

Conflicts:
	homeassistant/components/http/frontend.py
	homeassistant/components/http/www_static/frontend.html
This commit is contained in:
Geoff Norton committed 2015-01-22 05:27:26 +00:00
commit 8b947e2fab
59 files changed
+800 -202

No files matched your search

+1
View File
@@ -5,3 +5,4 @@ fi
git pull --recurse-submodules=yes
git submodule update --init --recursive
python3 -m pip install -r requirements.txt