Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2017-06-08 22:25:43 -07:00
commit 70deaf5832
45 changed files with 698 additions and 236 deletions

View file

@ -83,7 +83,6 @@
</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/releasing/ Releasing %}</li>
<li>{% active_link /developers/maintenance/ Maintenance %}</li>