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

Conflicts: source/getting-started/automation.markdown
2016-05-01 23:34:04 -07:00 · 2016-05-01 23:34:04 -07:00 · de586c5433
commit de586c5433
parent 4be4102776 16ac0e8dfb
120 changed files with 305 additions and 18 deletions
--- a/source/_includes/asides/component_navigation.html
+++ b/source/_includes/asides/component_navigation.html
@ -27,6 +27,12 @@
    </div>
  {% endif %}

+  {% if page.ha_release %}
+    <div class='section'>
+    Introduced in release: {{ page.ha_release }}
+    </div>
+  {% endif %}
+
  {% if is_platform and parent_name != 'sensor' and parent_name != 'binary_sensor' %}
    <div class='section'>
      This is a platform for