Merge remote-tracking branch 'upstream/current' into next

2016-08-27 20:56:42 -07:00 · 2016-08-27 20:56:42 -07:00 · 9e4330bed8
commit 9e4330bed8
parent e5ef5e74dc 3e84f46a85
108 changed files with 3083 additions and 105 deletions
--- a/source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown
+++ b/source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown
@ -70,15 +70,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/
--- a/source/_posts/2016-08-13-foursquare--fast.com--ffmpeg--gpsd.markdown
+++ b/source/_posts/2016-08-13-foursquare--fast.com--ffmpeg--gpsd.markdown