Quick hot fix after we found a bug in the migrator where it wouldn’t work with a database in a non-standard location. Thanks to [@n8henrie] and [@AlucardZero].
+
Quick hot fix after we found a bug in the migrator where it wouldn’t work with a database in a non-standard location. Thanks to @n8henrie and @AlucardZero.
Breaking changes
@@ -976,28 +976,6 @@ SQLite version 3.11.0 2016-02-15 17:29:24
Entity IDs of Verisure locks will change. This is a one time change but should improve readability.
-
«««< HEAD
-=======
-[@n8henrie]: https://github.com/n8henrie/
-[@AlucardZero]: https://github.com/AlucardZero/
-«««< HEAD
Quick hot fix after we found a bug in the migrator where it wouldn’t work with a database in a non-standard location. Thanks to [@n8henrie] and [@AlucardZero].
+
Quick hot fix after we found a bug in the migrator where it wouldn’t work with a database in a non-standard location. Thanks to @n8henrie and @AlucardZero.
Breaking changes
@@ -158,28 +158,6 @@
The APCUPSd Sensor was updated. This will need that you modify your configuration.yaml file.
Entity IDs of Verisure locks will change. This is a one time change but should improve readability.
-
-
«««< HEAD
-=======
-[@n8henrie]: https://github.com/n8henrie/
-[@AlucardZero]: https://github.com/AlucardZero/
-«««< HEAD
-
-
-
-
-
-
-
-
master
-
origin/master
-
-
-
-
-
-
-
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 60afdeb5ea..0f211517c7 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Community | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index eb7028b0cf..eeb3cb9cc1 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index ad1d429cc7..0a424092a5 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: ESP8266 | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 66a543ef9a..a4bb73bb24 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index e4ee893aaa..0b3cb332f2 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: iBeacons | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 74f0340b3e..f6358e7149 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 0b82c674ab..cbadc6d4ae 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index a2a43e0b2a..8941abbc4d 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: MQTT | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 46f415b4c8..d2a9ad465d 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Organisation | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index b097052ff4..84ffdc5c99 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: OwnTracks | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 83154530e1..ab88c06e25 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index df1b84abfd..9b2b679114 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index c06add7f97..591b356120 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
@@ -319,15 +319,10 @@ Quick hot fix after we found a bug in the migrator where it wouldn't work with a
[@turbokongen]: https://github.com/turbokongen/
[@usul27]: https://github.com/usul27
[@w1ll1am23]: https://github.com/w1ll1am23/
-<<<<<<< HEAD
-=======
[@n8henrie]: https://github.com/n8henrie/
[@AlucardZero]: https://github.com/AlucardZero/
-<<<<<<< HEAD
->>>>>>> master
-=======
[@Danielhiversen]: https://github.com/danielhiversen
->>>>>>> origin/master
+
[apcupsd-sensor]: /components/sensor.apcupsd/
[Brightness]: /components/light/
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index b12d2daa0d..abbadaf3ec 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Survey | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 885a1c4ffa..6c20798b98 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Talks | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index a57100e1f5..29fe78f362 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Technology | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 745e765569..d7af8c3d88 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]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index da4ee2a0f9..cb73dfc2d5 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Video | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 53f4b48787..556dbde17a 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
<![CDATA[Category: Website | Home Assistant]]>
- 2016-08-26T13:45:27+00:00
+ 2016-08-26T20:17:25+00:00https://home-assistant.io/
diff --git a/blog/index.html b/blog/index.html
index 07912d7fdc..45b1e21384 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -745,7 +745,7 @@ One of the graphs created with this tutorial.
Hotfix 0.24.1 - July 21
-
Quick hot fix after we found a bug in the migrator where it wouldn’t work with a database in a non-standard location. Thanks to [@n8henrie] and [@AlucardZero].
+
Quick hot fix after we found a bug in the migrator where it wouldn’t work with a database in a non-standard location. Thanks to @n8henrie and @AlucardZero.
Breaking changes
@@ -755,28 +755,6 @@ One of the graphs created with this tutorial.
Entity IDs of Verisure locks will change. This is a one time change but should improve readability.
-
«««< HEAD
-=======
-[@n8henrie]: https://github.com/n8henrie/
-[@AlucardZero]: https://github.com/AlucardZero/
-«««< HEAD