Merge branch 'master' into next

2016-01-12 23:15:23 -08:00 · 2016-01-12 23:15:23 -08:00 · 40d33437d7
commit 40d33437d7
parent ef83590a0c 8b777a7008
45 changed files with 68 additions and 21 deletions
--- a/source/images/blog/2015-12-release-10/alexa-fb.png
+++ b/source/images/blog/2015-12-release-10/alexa-fb.png
--- a/source/images/supported_brands/browser.png
+++ b/source/images/supported_brands/browser.png
--- a/source/images/supported_brands/conversation.png
+++ b/source/images/supported_brands/conversation.png
--- a/source/images/supported_brands/downloader.png
+++ b/source/images/supported_brands/downloader.png
--- a/source/images/supported_brands/heat-control.png
+++ b/source/images/supported_brands/heat-control.png
--- a/source/images/supported_brands/home-assistant.png
+++ b/source/images/supported_brands/home-assistant.png
--- a/source/images/supported_brands/http.png
+++ b/source/images/supported_brands/http.png
--- a/source/images/supported_brands/logbook.png
+++ b/source/images/supported_brands/logbook.png
--- a/source/images/supported_brands/sun.png
+++ b/source/images/supported_brands/sun.png
--- a/source/images/supported_brands/torque.png
+++ b/source/images/supported_brands/torque.png
--- a/source/images/supported_brands/updater.png
+++ b/source/images/supported_brands/updater.png