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

Conflicts:
	homeassistant/bootstrap.py
	homeassistant/components/frontend/version.py
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen committed 2016-04-19 22:53:26 -07:00
commit 4abbbf0f50
3 files changed
+10 -11

No files matched your search

+4
View File
@@ -222,6 +222,10 @@ class RequestHandler(SimpleHTTPRequestHandler):
if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]:
data.pop(DATA_API_PASSWORD, None)
# we really shouldn't need to forward the password from here
if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]:
data.pop(DATA_API_PASSWORD, None)
if '_METHOD' in data:
method = data.pop('_METHOD')