Merge branch 'master' into next

This commit is contained in:
Paulus Schoutsen 2016-05-21 09:52:05 -07:00
commit 0f14803a22
33 changed files with 294 additions and 123 deletions

View file

@ -46,6 +46,7 @@
<li>{% active_link /developers/server_sent_events/ Server-sent events %}</li>
</ul>
</li>
<li>{% active_link /developers/helpers/ Online helpers %}</li>
<li>{% active_link /developers/multiple_instances/ Multiple Instances %}</li>
<li>{% active_link /developers/website/ Home-Assistant.io %}</li>
<li>{% active_link /developers/credits/ Credits %}</li>