diff --git a/atom.xml b/atom.xml index 1eea246363..eae4004c84 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml index c976ad1fe3..4fdc3daaf1 100644 --- a/blog/categories/announcements/atom.xml +++ b/blog/categories/announcements/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Announcements | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 19ee3a8d88..c7c6850358 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 9166bf2275..b6f929f830 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index ef43fb362b..f655e8c86a 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index b4b904c297..ec2473be99 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 3404ec004b..cb8fef7731 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index 4a66eb04b0..f258904aea 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index fceb023148..073c100701 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml index b35347056a..ae30cc6eba 100644 --- a/blog/categories/media/atom.xml +++ b/blog/categories/media/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Media | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml index e4e5eda43b..1ccc3c9ef9 100644 --- a/blog/categories/merchandise/atom.xml +++ b/blog/categories/merchandise/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Merchandise | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index 45fbac8e00..3673babb56 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 6d26bdbc32..c20a08d372 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 9089da16ff..a03da132d4 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index e40de77371..3c11e90e0c 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 128f7c7b1f..0e605d5a9a 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 94c83d2ae9..c581ed4de9 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 1219c78254..1fe1708bbc 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 2a47f0948f..a41ed23552 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index d3d7fb32e4..5cef813ab2 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 3c1ca7541b..df65cf14c6 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 10508c6538..b6b1647e6e 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 463596c3ed..0bc05fb60a 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 12c5898473..91595f166b 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-09-16T18:27:52+00:00 + 2017-09-16T21:58:50+00:00 https://home-assistant.io/ diff --git a/developers/development_catching_up/index.html b/developers/development_catching_up/index.html index 39af53e4d8..311d135423 100644 --- a/developers/development_catching_up/index.html +++ b/developers/development_catching_up/index.html @@ -87,6 +87,11 @@
  • Continue rebase: git rebase --continue
  • Repeat until you’ve resolved all conflicts
    • +

    After rebasing your branch, you will have rewritten history relative to your GitHub fork’s branch. When you go to push you will see an error that your history has diverged from the original branch. In order to get your GitHub fork up-to-date with your local branch, you will need to force push, using the following command:

    +
    # Run this from your feature branch
+$ git push origin --force
+
    +

    Other workflows are covered in detail in the Github documentation. Add an additional remote after you clone your fork.

    $ git remote add upstream https://github.com/home-assistant/home-assistant.git
    diff --git a/sitemap.xml b/sitemap.xml index 2d3e910f91..47dc410703 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -3306,7 +3306,7 @@ https://home-assistant.io/components/switch.hook/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/cookbook/automation_for_rainy_days/ @@ -3938,99 +3938,99 @@ https://home-assistant.io/docs/autostart/init.d/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/api/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/configuration/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/installation/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/operation/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/reboot/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/running/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/updating/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/appdaemon/windows/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/certificates/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/hadashboard/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/hass-configurator/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/ios/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/nginx/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/notebooks/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/scenegen/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/ecosystem/synology/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/tools/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/tools/dev-tools/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/tools/hass/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/docs/tools/scripts/ -2017-09-16T18:27:52+00:00 +2017-09-16T21:58:50+00:00 https://home-assistant.io/faq/after-upgrading/ @@ -5030,62 +5030,62 @@ https://home-assistant.io/demo/frontend.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/index.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-event.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-info.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-service.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-state.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-template.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-history.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-iframe.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-logbook.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/demo/panels/ha-panel-map.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00 https://home-assistant.io/static/mdi-demo.html -2017-09-16T18:27:14+00:00 +2017-09-16T21:58:17+00:00