Merge branch 'current' into next

This commit is contained in:
Fabian Affolter 2017-07-28 22:22:07 +02:00
commit a979bcd4e4
No known key found for this signature in database
GPG key ID: DDF3D6F44AAB1336
45 changed files with 304 additions and 83 deletions

View file

@ -8,22 +8,14 @@
<li>
<b>{% active_link /docs/installation/ Installation %}</b>
<ul>
<li>{% active_link /hassio/ Hass.io %}</li>
<li>{% active_link /docs/installation/virtualenv/ Python Virtual Env %}</li>
<li>{% active_link /docs/installation/hassbian/ Hassbian %}</li>
<li>{% active_link /docs/installation/raspberry-pi-all-in-one/ Raspberry Pi All-in-One %}</li>
<li>{% active_link /docs/installation/updating/ Updating %}</li>
<li>{% active_link /docs/installation/troubleshooting/ Troubleshooting %}</li>
</ul>
</li>
<li>
<b>{% active_link /docs/hassbian/ Hassbian %}</b>
<ul>
<li>{% active_link /docs/hassbian/installation/ Installation %}</li>
<li>{% active_link /docs/hassbian/customization/ Customization %}</li>
<li>{% active_link /docs/hassbian/common-tasks/ Common tasks %}</li>
<li>{% active_link /docs/hassbian/integrations/ Integrations %}</li>
<li>{% active_link /docs/hassbian/upgrading/ Upgrading %}</li>
</ul>
</li>
<li>
<b>{% active_link /docs/configuration/ Configuration %}</b>
<ul>